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

Merge remote-tracking branch 'Upstream/develop' into develop-loan

Browse Source
This commit is contained in:
aspangaro 2014-10-04 08:10:12 +02:00
commit c1db82a791
107 changed files with 1794 additions and 967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -51,7 +51,7 @@ For users:
- New: [ task #1204 ] add Numering contrat module free (like leopard in product module). - New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
- New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice. - New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
- New: Enable supplier price log table. - New: Enable supplier price log table.
- New: [ task #1204 ] add a External reference to contract. - New: [ task #1204 ] add a supplier reference to contract.
- New: [ task #1218 ] Can drag and drop an event from calendar to change its day. - New: [ task #1218 ] Can drag and drop an event from calendar to change its day.
- New: Optimize size of image static resources. - New: Optimize size of image static resources.
- New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card. - New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.
@ -59,7 +59,9 @@ For users:
- New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture - New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture
onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals. onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
- New: Add more search field in list of cheque deposits. - New: Add more search field in list of cheque deposits.
- New: Add feature to order to invoice on supplier part
- Upgrade phpexcel lib to 1.7.8 - Upgrade phpexcel lib to 1.7.8
- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export
- Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
- Fix: [ bug #1470, #1472, #1473] User trigger problem - Fix: [ bug #1470, #1472, #1473] User trigger problem
- Fix: [ bug #1489, #1491 ] Intervention trigger problem - Fix: [ bug #1489, #1491 ] Intervention trigger problem

4
composer.json
View File

@ -24,6 +24,8 @@
"ext-mcrypt": "*", "ext-mcrypt": "*",
"ext-openssl": "*", "ext-openssl": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-soap": "*" "ext-soap": "*",
"ext-zip": "*",
"ext-xml": "*"
} }
} }

4
htdocs/adherents/card.php
View File

@ -460,7 +460,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
$object->email = $email; $object->email = $email;
$object->login = $login; $object->login = $login;
$object->pass = $pass; $object->pass = $pass;
$object->naiss = $birthdate; $object->birth = $birthdate;
$object->photo = $photo; $object->photo = $photo;
$object->typeid = $typeid; $object->typeid = $typeid;
//$object->note = $comment; //$object->note = $comment;
@ -883,7 +883,7 @@ else
// Birthday // Birthday
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n"; print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
$form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
print "</td></tr>\n"; print "</td></tr>\n";
// Profil public // Profil public

2
htdocs/adherents/class/adherent.class.php
View File

@ -1090,7 +1090,7 @@ class Adherent extends CommonObject
$this->ref = $obj->rowid; $this->ref = $obj->rowid;
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->ref_ext = $obj->ref_ext; $this->ref_ext = $obj->ref_ext;
$this->civility_id = $obj->civility; $this->civility_id = $obj->civility_id;
$this->firstname = $obj->firstname; $this->firstname = $obj->firstname;
$this->lastname = $obj->lastname; $this->lastname = $obj->lastname;
$this->login = $obj->login; $this->login = $obj->login;

28
htdocs/cashdesk/css/style.css
View File

@ -215,11 +215,6 @@ p.titre {
border: 1px solid #6d3f6d; border: 1px solid #6d3f6d;
} }
.bouton_login input {
background: #fff;
border: 1px solid #6d3f6d;
}
.principal { .principal {
float: left; float: left;
margin: 0 15px; margin: 0 15px;
@ -331,29 +326,6 @@ p.titre {
} }
/* -------------- Boutons --------------------- */ /* -------------- Boutons --------------------- */
.bouton_ajout_article,.bouton_mode_reglement,.bouton_validation {
border: 1px solid #999;
background: #f7f7f7;
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
}
.bouton_ajout_article:hover,.bouton_mode_reglement:hover,.bouton_validation:hover
{
background: #cccccc;
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
}
.bouton_ajout_article { .bouton_ajout_article {
margin-top: 10px; margin-top: 10px;
width: 100%; width: 100%;

2
htdocs/cashdesk/index.php
View File

@ -152,7 +152,7 @@ print "</tr>\n";
</table> </table>
<br> <br>
<div align="center"><span class="bouton_login"><input name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div> <div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
</form> </form>
</fieldset> </fieldset>

13
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -144,7 +144,7 @@ $langs->load("cashdesk");
</tr> </tr>
</table> </table>
<input class="bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" /> <input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
</form> </form>
</fieldset> </fieldset>
@ -179,7 +179,7 @@ $langs->load("cashdesk");
$langs->load("errors"); $langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />'; print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
} }
else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />'; else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0) if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
@ -187,7 +187,7 @@ $langs->load("cashdesk");
$langs->load("errors"); $langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />'; print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
} }
else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />'; else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
@ -195,7 +195,7 @@ $langs->load("cashdesk");
$langs->load("errors"); $langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />'; print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
} }
else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />'; else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
print '</td>'; print '</td>';
?> ?>
</tr> </tr>
@ -203,14 +203,11 @@ $langs->load("cashdesk");
<table> <table>
<tr> <tr>
<td> <td>
<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" /> <input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php <?php
echo $langs->trans("DateEcheance").' :'; echo $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement'); print $form->select_date(-1,'txtDatePaiement');
?> ?>
<!-- <input class="texte2" type="text" id="txtDatePaiement" name="txtDatePaiement" value="" />
<input class="bouton_cal" type="image" src="img/calendrier.png" id="btnCalendrier" value="..." title="<?php echo $langs->trans("CalTip"); ?>" />
-->
</td> </td>
</tr> </tr>

48
htdocs/comm/action/card.php
View File

@ -68,7 +68,7 @@ $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|
if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid); if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid);
$error=GETPOST("error"); $error=GETPOST("error");
$donotclearsession=0; $donotclearsession=GETPOST('donotclearsession')?GETPOST('donotclearsession'):0;
$cactioncomm = new CActionComm($db); $cactioncomm = new CActionComm($db);
$object = new ActionComm($db); $object = new ActionComm($db);
@ -89,14 +89,16 @@ $hookmanager->initHooks(array('actioncard'));
*/ */
// Remove user to assigned list // Remove user to assigned list
if (! empty($_POST['removedassigned'])) if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
{ {
$idtoremove=$_POST['removedassigned']; $idtoremove=GETPOST('removedassigned');
if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1); if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1);
else $tmpassigneduserids=array(); else $tmpassigneduserids=array();
foreach ($tmpassigneduserids as $key => $val) foreach ($tmpassigneduserids as $key => $val)
{ {
if ($val['id'] == $idtoremove) unset($tmpassigneduserids[$key]); if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
} }
//var_dump($_POST['removedassigned']);exit; //var_dump($_POST['removedassigned']);exit;
$_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids); $_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids);
@ -357,23 +359,23 @@ if ($action == 'update')
$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]); $datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]); $datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
$object->fk_action = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm'); $object->fk_action = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
$object->label = $_POST["label"]; $object->label = GETPOST("label");
$object->datep = $datep; $object->datep = $datep;
$object->datef = $datef; $object->datef = $datef;
$object->percentage = $percentage; $object->percentage = $percentage;
$object->priority = $_POST["priority"]; $object->priority = GETPOST("priority");
$object->fulldayevent= $_POST["fullday"]?1:0; $object->fulldayevent= GETPOST("fullday")?1:0;
$object->location = GETPOST('location'); $object->location = GETPOST('location');
$object->socid = $_POST["socid"]; $object->socid = GETPOST("socid");
$object->contactid = $_POST["contactid"]; $object->contactid = GETPOST("contactid",'int');
//$object->societe->id = $_POST["socid"]; // deprecated //$object->societe->id = $_POST["socid"]; // deprecated
//$object->contact->id = $_POST["contactid"]; // deprecated //$object->contact->id = $_POST["contactid"]; // deprecated
$object->fk_project = $_POST["projectid"]; $object->fk_project = GETPOST("projectid",'int');
$object->note = $_POST["note"]; $object->note = GETPOST("note");
$object->pnote = $_POST["note"]; $object->pnote = GETPOST("note");
$object->fk_element = $_POST["fk_element"]; $object->fk_element = GETPOST("fk_element");
$object->elementtype = $_POST["elementtype"]; $object->elementtype = GETPOST("elementtype");
if (! $datef && $percentage == 100) if (! $datef && $percentage == 100)
{ {
@ -394,7 +396,7 @@ if ($action == 'update')
$tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array(); $tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array();
foreach($tmplist1 as $key => $val) foreach($tmplist1 as $key => $val)
{ {
if ($val['id'] && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val; if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
} }
} }
@ -603,6 +605,7 @@ if ($action == 'create')
print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">'; print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="donotclearsession" value="1">';
if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">'; if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
@ -610,7 +613,7 @@ if ($action == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Type d'action actifs // Type of event
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{ {
print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>'; print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
@ -862,13 +865,14 @@ if ($id > 0)
// Ref // Ref
print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>'; print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
// Type // Type of event
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{ {
print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">'; print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto"); $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
print '</td></tr>'; print '</td></tr>';
} }
else print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
// Title // Title
print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$object->label.'"></td></tr>'; print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$object->label.'"></td></tr>';
@ -1225,7 +1229,7 @@ if ($id > 0)
// Link to agenda views // Link to agenda views
print '<div id="agendaviewbutton">'; print '<div id="agendaviewbutton">';
print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">'; print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_month">'; print '<input type="hidden" name="action" value="show_month">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">'; print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@ -1234,7 +1238,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">'; //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">'; print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
print '</form>'."\n"; print '</form>'."\n";
print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">'; print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_week">'; print '<input type="hidden" name="action" value="show_week">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">'; print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@ -1243,7 +1247,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">'; //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">'; print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
print '</form>'."\n"; print '</form>'."\n";
print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">'; print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_day">'; print '<input type="hidden" name="action" value="show_day">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">'; print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@ -1252,7 +1256,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">'; //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">'; print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
print '</form>'."\n"; print '</form>'."\n";
print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left">'; print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_peruser">'; print '<input type="hidden" name="action" value="show_peruser">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">'; print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';

21
htdocs/comm/action/class/actioncomm.class.php
View File

@ -95,14 +95,16 @@ class ActionComm extends CommonObject
*/ */
function __construct($db) function __construct($db)
{ {
global $langs;
$this->db = $db; $this->db = $db;
//$this->author = new stdClass(); //$this->author = new stdClass();
//$this->usermod = new stdClass(); //$this->usermod = new stdClass();
//$this->usertodo = new stdClass(); //$this->usertodo = new stdClass();
//$this->userdone = new stdClass(); //$this->userdone = new stdClass();
$this->societe = new stdClass(); $this->societe = new stdClass(); // deprecated
$this->contact = new stdClass(); $this->contact = new stdClass(); // deprecated
} }
/** /**
@ -415,7 +417,9 @@ class ActionComm extends CommonObject
while ($obj = $this->db->fetch_object($resql2)) while ($obj = $this->db->fetch_object($resql2))
{ {
$this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
if (empty($this->userownerid)) $this->userownerid=$obj->fk_element; // If not defined (should not happened, we fix this)
} }
return 1; return 1;
} }
else else
@ -524,6 +528,11 @@ class ActionComm extends CommonObject
return -1; return -1;
} }
$socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0));
$contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0));
$userownerid=($this->userownerid?$this->userownerid:((isset($this->usertodo->id) && $this->usertodo->id > 0) ? $this->usertodo->id : 0));
$userdoneid=($this->userdoneid?$this->userdoneid:((isset($this->userdone->id) && $this->userdone->id > 0) ? $this->userdone->id : 0));
$this->db->begin(); $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm "; $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
@ -534,16 +543,16 @@ class ActionComm extends CommonObject
$sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null'); $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
$sql.= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null"); // deprecated $sql.= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null"); // deprecated
$sql.= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'":"null"); $sql.= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'":"null");
$sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null"); $sql.= ", fk_soc =". ($this->socid > 0 ? "'".$this->socid."'":"null");
$sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null"); $sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null");
$sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null"); $sql.= ", fk_contact =". ($contactid > 0 ? "'".$this->contactid."'":"null");
$sql.= ", priority = '".$this->priority."'"; $sql.= ", priority = '".$this->priority."'";
$sql.= ", fulldayevent = '".$this->fulldayevent."'"; $sql.= ", fulldayevent = '".$this->fulldayevent."'";
$sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null"); $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
$sql.= ", transparency = '".$this->transparency."'"; $sql.= ", transparency = '".$this->transparency."'";
$sql.= ", fk_user_mod = '".$user->id."'"; $sql.= ", fk_user_mod = '".$user->id."'";
$sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null"); $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null");
$sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null"); $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null");
if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null"); if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null");
if (! empty($this->elementtype)) $sql.= ", elementtype=".($this->elementtype?"'".$this->elementtype."'":"null"); if (! empty($this->elementtype)) $sql.= ", elementtype=".($this->elementtype?"'".$this->elementtype."'":"null");
$sql.= " WHERE id=".$this->id; $sql.= " WHERE id=".$this->id;

34
htdocs/comm/action/peruser.php
View File

@ -320,7 +320,7 @@ $sql.= ' a.datea2,';
$sql.= ' a.percent,'; $sql.= ' a.percent,';
$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,'; $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,'; $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
$sql.= ' a.fk_soc, a.fk_contact,'; $sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype,';
$sql.= ' ca.code, ca.color'; $sql.= ' ca.code, ca.color';
$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a"; $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@ -415,6 +415,9 @@ if ($resql)
//$event->societe->id=$obj->fk_soc; // deprecated //$event->societe->id=$obj->fk_soc; // deprecated
//$event->contact->id=$obj->fk_contact; // deprecated //$event->contact->id=$obj->fk_contact; // deprecated
$event->fk_element=$obj->fk_element;
$event->elementtype=$obj->elementtype;
// Defined date_start_in_calendar and date_end_in_calendar property // Defined date_start_in_calendar and date_end_in_calendar property
// They are date start and end of action but modified to not be outside calendar view. // They are date start and end of action but modified to not be outside calendar view.
if ($event->percentage <= 0) if ($event->percentage <= 0)
@ -598,8 +601,13 @@ else
} }
// Load array of colors by type // Load array of colors by type
// TODO
$colorsbytype=array(); $colorsbytype=array();
$sql="SELECT code, color FROM ".MAIN_DB_PREFIX."c_actioncomm";
$resql=$db->query($sql);
while ($obj = $db->fetch_object($resql))
{
$colorsbytype[$obj->code]=$obj->color;
}
// Loop on each user to show calendar // Loop on each user to show calendar
$todayarray=dol_getdate($now,'fast'); $todayarray=dol_getdate($now,'fast');
@ -704,14 +712,15 @@ $db->close();
* @param int $showinfo Add extended information (used by day view) * @param int $showinfo Add extended information (used by day view)
* @param int $minheight Minimum height for each event. 60px by default. * @param int $minheight Minimum height for each event. 60px by default.
* @param boolean $showheader Show header * @param boolean $showheader Show header
* @param array $colorsbytype Array with colors by type
* @return void * @return void
*/ */
function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false) function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array())
{ {
global $db; global $db;
global $user, $conf, $langs; global $user, $conf, $langs, $hookmanager, $action;
global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form
global $theme_datacolor; global $theme_datacolor; // Array with a list of different we can use (come from theme)
global $cachethirdparties, $cachecontacts, $colorindexused; global $cachethirdparties, $cachecontacts, $colorindexused;
global $begin_h, $end_h; global $begin_h, $end_h;
@ -743,6 +752,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
if (! in_array($username->id,$keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show if (! in_array($username->id,$keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
//if ($username->id != $event->userownerid) continue; // We discard record if event is from another user than user we want to show //if ($username->id != $event->userownerid) continue; // We discard record if event is from another user than user we want to show
$parameters=array();
$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar); $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
// Define $color (Hex string like '0088FF') and $cssclass of event // Define $color (Hex string like '0088FF') and $cssclass of event
@ -750,12 +763,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
if (in_array($user->id, $keysofuserassigned)) if (in_array($user->id, $keysofuserassigned))
{ {
$nummytasks++; $cssclass='family_mytasks'; $nummytasks++; $cssclass='family_mytasks';
$color=$event->type_color; if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
} }
else if ($event->type_code == 'ICALEVENT') else if ($event->type_code == 'ICALEVENT')
{ {
$numical++; $numical++;
if (! empty($event->icalname)) { if (! empty($event->icalname))
{
if (! isset($numicals[dol_string_nospecial($event->icalname)])) { if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
$numicals[dol_string_nospecial($event->icalname)] = 0; $numicals[dol_string_nospecial($event->icalname)] = 0;
} }
@ -772,7 +786,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
else else
{ {
$numother++; $cssclass='family_other'; $numother++; $cssclass='family_other';
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
} }
if ($color < 0) // Color was not forced. Set color according to color index. if ($color < 0) // Color was not forced. Set color according to color index.
{ {
// Define color index if not yet defined // Define color index if not yet defined
@ -858,8 +874,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
$cases2[$h][$event->id]['string']=$event->label; $cases2[$h][$event->id]['string']=$event->label;
$cases1[$h][$event->id]['typecode']=$event->type_code; $cases1[$h][$event->id]['typecode']=$event->type_code;
$cases2[$h][$event->id]['typecode']=$event->type_code; $cases2[$h][$event->id]['typecode']=$event->type_code;
$cases1[$h][$event->id]['color']='009900'; $cases1[$h][$event->id]['color']=$color;
$cases2[$h][$event->id]['color']='009900'; $cases2[$h][$event->id]['color']=$color;
} }
} }
$i++; $i++;

4
htdocs/compta/hrm.php
View File

@ -38,6 +38,8 @@ $langs->load('users');
$langs->load('holidays'); $langs->load('holidays');
$langs->load('trips'); $langs->load('trips');
$socid=GETPOST("socid");
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
@ -117,7 +119,7 @@ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAI
$sql.= " WHERE u.rowid = d.fk_user"; $sql.= " WHERE u.rowid = d.fk_user";
$sql.= " AND d.entity = ".$conf->entity; $sql.= " AND d.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid; // FIXME $socid is not defined if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
$sql.= $db->order("d.tms","DESC"); $sql.= $db->order("d.tms","DESC");
$sql.= $db->plimit($max, 0); $sql.= $db->plimit($max, 0);

205
htdocs/compta/resultat/clientfourn.php
View File

@ -547,128 +547,135 @@ if ($mysoc->tva_assuj == 'franchise') // Non assujeti
* Salaries * Salaries
*/ */
print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>'; if ($conf->salaries->enabled)
$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
$sql.= " WHERE p.entity = ".$conf->entity;
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
$sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
$sql.= " ORDER BY u.firstname";
dol_syslog("get payment salaries");
$result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result)
{ {
$num = $db->num_rows($result); print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
$var=true; $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
$i = 0; $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
if ($num) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
{ $sql.= " WHERE p.entity = ".$conf->entity;
while ($i < $num) if (! empty($date_start) && ! empty($date_end))
{ $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
$obj = $db->fetch_object($result);
$total_ht -= $obj->amount; $sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
$total_ttc -= $obj->amount; $sql.= " ORDER BY u.firstname";
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
$var = !$var; dol_syslog("get payment salaries");
print "<tr ".$bc[$var]."><td>&nbsp;</td>"; $result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result)
{
$num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num)
{
while ($i < $num)
{
$obj = $db->fetch_object($result);
print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n"; $total_ht -= $obj->amount;
$total_ttc -= $obj->amount;
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>'; $var = !$var;
print '<td align="right">'.price(-$obj->amount).'</td>'; print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '</tr>';
$i++; print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
}
} if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
else print '<td align="right">'.price(-$obj->amount).'</td>';
{ print '</tr>';
$var = !$var; $i++;
print "<tr ".$bc[$var]."><td>&nbsp;</td>"; }
print '<td colspan="3">'.$langs->trans("None").'</td>'; }
print '</tr>'; else
} {
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
}
}
else
{
dol_print_error($db);
}
print '<tr class="liste_total">';
if ($modecompta == 'CREANCES-DETTES')
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
print '</tr>';
} }
else
{
dol_print_error($db);
}
print '<tr class="liste_total">';
if ($modecompta == 'CREANCES-DETTES')
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
print '</tr>';
/* /*
* Dunning * Donation
*/ */
print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>'; if ($conf->donation->enabled)
$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
$sql.= " WHERE p.entity = ".$conf->entity;
$sql.= " AND fk_statut=2";
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
$sql.= " GROUP BY p.societe, p.firstname, p.lastname";
$sql.= " ORDER BY p.societe, p.firstname, p.lastname";
dol_syslog("get dunning");
$result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result)
{ {
$num = $db->num_rows($result); print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>';
$var=true; $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
$i = 0; $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
if ($num) $sql.= " WHERE p.entity = ".$conf->entity;
$sql.= " AND fk_statut=2";
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
$sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
$sql.= " ORDER BY p.societe, p.firstname, p.lastname, dm";
dol_syslog("get dunning");
$result=$db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result)
{ {
while ($i < $num) $num = $db->num_rows($result);
$var=true;
$i = 0;
if ($num)
{ {
$obj = $db->fetch_object($result); while ($i < $num)
{
$obj = $db->fetch_object($result);
$total_ht += $obj->amount; $total_ht += $obj->amount;
$total_ttc += $obj->amount; $total_ttc += $obj->amount;
$subtotal_ht += $obj->amount; $subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount; $subtotal_ttc += $obj->amount;
$var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/compta/dons/list.php?search_company=".$obj->nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>';
$i++;
}
}
else
{
$var = !$var; $var = !$var;
print "<tr ".$bc[$var]."><td>&nbsp;</td>"; print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/compta/dons/list.php?search_company=".$obj->nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>'; print '</tr>';
$i++;
} }
} }
else else
{ {
$var = !$var; dol_print_error($db);
print "<tr ".$bc[$var]."><td>&nbsp;</td>";
print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
} }
print '<tr class="liste_total">';
if ($modecompta == 'CREANCES-DETTES')
print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
print '</tr>';
} }
else
{
dol_print_error($db);
}
print '<tr class="liste_total">';
if ($modecompta == 'CREANCES-DETTES')
print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
print '</tr>';
/* /*
* VAT * VAT

25
htdocs/contact/list.php
View File

@ -39,6 +39,7 @@ $contactid = GETPOST('id','int');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact', $contactid,''); $result = restrictedArea($user, 'contact', $contactid,'');
$search_firstlast_only=GETPOST("search_firstlast_only");
$search_lastname=GETPOST("search_lastname"); $search_lastname=GETPOST("search_lastname");
$search_firstname=GETPOST("search_firstname"); $search_firstname=GETPOST("search_firstname");
$search_societe=GETPOST("search_societe"); $search_societe=GETPOST("search_societe");
@ -51,8 +52,8 @@ $search_fax=GETPOST("search_fax");
$search_email=GETPOST("search_email"); $search_email=GETPOST("search_email");
$search_skype=GETPOST("search_skype"); $search_skype=GETPOST("search_skype");
$search_priv=GETPOST("search_priv"); $search_priv=GETPOST("search_priv");
$search_categ = GETPOST("search_categ",'int'); $search_categ=GETPOST("search_categ",'int');
$search_status = GETPOST("search_status",'int'); $search_statu=GETPOST("search_status",'int');
if ($search_status=='') $search_status=1; // always display activ customer first if ($search_status=='') $search_status=1; // always display activ customer first
@ -74,7 +75,12 @@ $offset = $limit * $page;
$langs->load("companies"); $langs->load("companies");
$titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
if ($type == "c" || $type=="p") if ($type == "p")
{
$titre.=' ('.$langs->trans("ThirdPartyProspects").')';
$urlfiche="card.php";
}
if ($type == "c")
{ {
$titre.=' ('.$langs->trans("ThirdPartyCustomers").')'; $titre.=' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche="card.php"; $urlfiche="card.php";
@ -92,6 +98,7 @@ else if ($type == "o")
if (GETPOST('button_removefilter')) if (GETPOST('button_removefilter'))
{ {
$search_firstlast_only="";
$search_lastname=""; $search_lastname="";
$search_firstname=""; $search_firstname="";
$search_societe=""; $search_societe="";
@ -154,6 +161,9 @@ else
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ; if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL"; if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_firstlast_only) {
$sql .= natural_search(array('p.lastname','p.firstname'), $search_firstlast_only);
}
if ($search_lastname) { // filter on lastname if ($search_lastname) { // filter on lastname
$sql .= natural_search('p.lastname', $search_lastname); $sql .= natural_search('p.lastname', $search_lastname);
} }
@ -213,7 +223,7 @@ else if ($type == "p") // filtre sur type
} }
if ($sall) if ($sall)
{ {
$sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email'), $sall); $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email', 's.nom'), $sall);
} }
if (! empty($socid)) if (! empty($socid))
{ {
@ -277,9 +287,12 @@ if ($result)
if ($sall) if ($sall)
{ {
print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("ThirdParty")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
} }
if ($search_firstlast_only)
{
print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")."): ".$search_firstlast_only;
}
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
// Ligne des titres // Ligne des titres

42
htdocs/contrat/card.php
View File

@ -29,18 +29,18 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/contract/modules_contract.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
if (! empty($conf->projet->enabled)) { if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
} }
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
@ -215,7 +215,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
$object->fk_project = GETPOST('projectid','int'); $object->fk_project = GETPOST('projectid','int');
$object->remise_percent = GETPOST('remise_percent','alpha'); $object->remise_percent = GETPOST('remise_percent','alpha');
$object->ref = GETPOST('ref','alpha'); $object->ref = GETPOST('ref','alpha');
$object->ref_customer = GETPOST('ref_customer','alpha'); $object->ref_supplier = GETPOST('ref_supplier','alpha');
// If creation from another object of another module (Example: origin=propal, originid=1) // If creation from another object of another module (Example: origin=propal, originid=1)
if ($_POST['origin'] && $_POST['originid']) if ($_POST['origin'] && $_POST['originid'])
@ -718,13 +718,17 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra
$action = 'edit_extras'; $action = 'edit_extras';
setEventMessage($object->error,'errors'); setEventMessage($object->error,'errors');
} }
} elseif ($action=='setref_customer') { } elseif ($action=='setref_supplier') {
$object->ref_customer=GETPOST('ref_customer','alpha'); $result = $object->fetch($id);
if ($result < 0) {
setEventMessage($object->errors,'errors');
}
$object->ref_supplier=GETPOST('ref_supplier','alpha');
$result = $object->update($user); $result = $object->update($user);
if ($result < 0) { if ($result < 0) {
setEventMessage($object->errors,'errors'); setEventMessage($object->errors,'errors');
$action='editref_customer'; $action='editref_supplier';
} else { } else {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit; exit;
@ -934,7 +938,7 @@ if ($action == 'create')
// Ref Int // Ref Int
print '<tr><td>'.$langs->trans('RefCustomer').'</td>'; print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
print '<td colspan="2"><input type="text" siez="5" name="ref_customer" id="ref_customer" value="'.GETPOST('ref_customer','alpha').'"></td></tr>'; print '<td colspan="2"><input type="text" siez="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
// Customer // Customer
print '<tr>'; print '<tr>';
@ -1131,9 +1135,9 @@ else
print '<tr>'; print '<tr>';
print '<td width="20%">'; print '<td width="20%">';
print $form->editfieldkey("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
print '</td><td>'; print '</td><td>';
print $form->editfieldval("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -1812,8 +1816,8 @@ else
/* /*
* Linked object block * Linked object block
*/ */
$somethingshown = $object->showLinkedObjectBlock(); $somethingshown=$object->showLinkedObjectBlock();
print '</div><div class="fichehalfright"><div class="ficheaddleft">'; print '</div><div class="fichehalfright"><div class="ficheaddleft">';

14
htdocs/contrat/class/contrat.class.php
View File

@ -46,7 +46,7 @@ class Contrat extends CommonObject
var $id; var $id;
var $ref; var $ref;
var $ref_ext; var $ref_ext;
var $ref_customer; var $ref_supplier;
var $socid; var $socid;
var $societe; // Objet societe var $societe; // Objet societe
var $statut=0; // 0=Draft, var $statut=0; // 0=Draft,
@ -403,7 +403,7 @@ class Contrat extends CommonObject
$sql.= " fk_projet,"; $sql.= " fk_projet,";
$sql.= " fk_commercial_signature, fk_commercial_suivi,"; $sql.= " fk_commercial_signature, fk_commercial_suivi,";
$sql.= " note_private, note_public, model_pdf, extraparams"; $sql.= " note_private, note_public, model_pdf, extraparams";
$sql.= " ,ref_customer"; $sql.= " ,ref_supplier";
$sql.= " ,ref_ext"; $sql.= " ,ref_ext";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat"; $sql.= " FROM ".MAIN_DB_PREFIX."contrat";
if ($ref) if ($ref)
@ -423,7 +423,7 @@ class Contrat extends CommonObject
{ {
$this->id = $result["rowid"]; $this->id = $result["rowid"];
$this->ref = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"]; $this->ref = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
$this->ref_customer = $result["ref_customer"]; $this->ref_supplier = $result["ref_supplier"];
$this->ref_ext = $result["ref_ext"]; $this->ref_ext = $result["ref_ext"];
$this->statut = $result["statut"]; $this->statut = $result["statut"];
$this->mise_en_service = $this->db->jdate($result["datemise"]); $this->mise_en_service = $this->db->jdate($result["datemise"]);
@ -726,7 +726,7 @@ class Contrat extends CommonObject
// Insert contract // Insert contract
$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,"; $sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
$sql.= " ref, entity, note_private, note_public, ref_customer, ref_ext)"; $sql.= " ref, entity, note_private, note_public, ref_supplier, ref_ext)";
$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id; $sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
$sql.= ", '".$this->db->idate($this->date_contrat)."'"; $sql.= ", '".$this->db->idate($this->date_contrat)."'";
$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL"); $sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
@ -736,7 +736,7 @@ class Contrat extends CommonObject
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
$sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL"); $sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL"); $sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
$sql.= ")"; $sql.= ")";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
@ -988,7 +988,7 @@ class Contrat extends CommonObject
// Clean parameters // Clean parameters
if (isset($this->ref)) $this->ref=trim($this->ref); if (isset($this->ref)) $this->ref=trim($this->ref);
if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer); if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext); if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
if (isset($this->entity)) $this->entity=trim($this->entity); if (isset($this->entity)) $this->entity=trim($this->entity);
if (isset($this->statut)) $this->statut=trim($this->statut); if (isset($this->statut)) $this->statut=trim($this->statut);
@ -1012,7 +1012,7 @@ class Contrat extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").","; $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").","; $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").","; $sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
$sql.= " entity=".$conf->entity.","; $sql.= " entity=".$conf->entity.",";
$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').","; $sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";

16
htdocs/contrat/list.php
View File

@ -42,7 +42,7 @@ $offset = $limit * $page ;
$search_nom=GETPOST('search_nom'); $search_nom=GETPOST('search_nom');
$search_contract=GETPOST('search_contract'); $search_contract=GETPOST('search_contract');
$search_ref_customer=GETPOST('search_ref_customer','alpha'); $search_ref_supplier=GETPOST('search_ref_supplier','alpha');
$sall=GETPOST('sall'); $sall=GETPOST('sall');
$statut=GETPOST('statut')?GETPOST('statut'):1; $statut=GETPOST('statut')?GETPOST('statut'):1;
$socid=GETPOST('socid'); $socid=GETPOST('socid');
@ -75,7 +75,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
$sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
$sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,"; $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,";
$sql.= " s.nom, s.rowid as socid"; $sql.= " s.nom, s.rowid as socid";
$sql.= " ,c.ref_customer"; $sql.= " ,c.ref_supplier";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."contrat as c"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c";
@ -90,8 +90,8 @@ if ($search_nom) {
if ($search_contract) { if ($search_contract) {
$sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract); $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
} }
if (!empty($search_ref_customer)) { if (!empty($search_ref_supplier)) {
$sql .= natural_search(array('c.ref_customer'), $search_ref_customer); $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
} }
if ($sall) { if ($sall) {
$sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall);
@ -114,9 +114,9 @@ if ($resql)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
$param='&amp;search_contract='.$search_contract; $param='&amp;search_contract='.$search_contract;
$param.='&amp;search_nom='.$search_nom; $param.='&amp;search_nom='.$search_nom;
$param.='&amp;search_ref_customer='.$search_ref_customer; $param.='&amp;search_ref_supplier='.$search_ref_supplier;
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
//print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder); //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
@ -134,7 +134,7 @@ if ($resql)
print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">'; print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">';
print '</td>'; print '</td>';
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input type="text" class="flat" size="7" name="search_ref_customer value="'.$search_ref_customer.'">'; print '<input type="text" class="flat" size="7" name="search_ref_supplier value="'.$search_ref_supplier.'">';
print '</td>'; print '</td>';
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input type="text" class="flat" size="24" name="search_nom" value="'.$search_nom.'">'; print '<input type="text" class="flat" size="24" name="search_nom" value="'.$search_nom.'">';
@ -156,7 +156,7 @@ if ($resql)
print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>'; print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>';
if ($obj->nb_late) print img_warning($langs->trans("Late")); if ($obj->nb_late) print img_warning($langs->trans("Late"));
print '</td>'; print '</td>';
print '<td>'.$obj->ref_customer.'</td>'; print '<td>'.$obj->ref_supplier.'</td>';
print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>'; print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
//print '<td align="center">'.dol_print_date($obj->datec).'</td>'; //print '<td align="center">'.dol_print_date($obj->datec).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>'; print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>';

7
htdocs/core/class/hookmanager.class.php
View File

@ -114,8 +114,8 @@ class HookManager
* *
* @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...) * @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
* @param array $parameters Array of parameters * @param array $parameters Array of parameters
* @param Object $object Object to use hooks on * @param Object $object Object to use hooks on
* @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
* @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO. * @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
* For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints. * For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints.
* Can also return some values into an array ->results. * Can also return some values into an array ->results.
@ -144,7 +144,8 @@ class HookManager
'moveUploadedFile', 'moveUploadedFile',
'pdf_writelinedesc', 'pdf_writelinedesc',
'paymentsupplierinvoices', 'paymentsupplierinvoices',
'printSearchForm' 'printSearchForm',
'formatEvent'
) )
)) $hooktype='addreplace'; )) $hooktype='addreplace';

16
htdocs/core/lib/security.lib.php
View File

@ -100,7 +100,7 @@ function dol_hash($chain,$type=0)
* @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...) * @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
* @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional). * @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
* @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional) * @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
* @param string $feature2 Feature to check, second level of permission (optional) * @param string $feature2 Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional) * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
* @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional) * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
* @param Canvas $objcanvas Object canvas * @param Canvas $objcanvas Object canvas
@ -140,7 +140,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
// Check read permission from module // Check read permission from module
$readok=1; $nbko=0; $readok=1; $nbko=0;
foreach ($featuresarray as $feature) foreach ($featuresarray as $feature) // first we check nb of test ko
{ {
if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules)) // If limits on modules for external users, module must be into list of modules for external users if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules)) // If limits on modules for external users, module must be into list of modules for external users
{ {
@ -174,11 +174,17 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
} }
else if (! empty($feature2)) // This should be used for future changes else if (! empty($feature2)) // This should be used for future changes
{ {
$tmpreadok=1;
foreach($feature2 as $subfeature) foreach($feature2 as $subfeature)
{ {
if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $readok=0; $nbko++; } if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $readok=0; $nbko++; } else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
else { $readok=1; break; } // Break is to bypass second test if the first is ok else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
}
if (! $tmpreadok) // We found a test on feature that is ko
{
$readok=0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
$nbko++;
} }
} }
else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) // This is for old permissions else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) // This is for old permissions

11
htdocs/core/menus/standard/eldy.lib.php
View File

@ -624,7 +624,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
} }
// Contacts // Contacts
$newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts'); $newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ThirdParty") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer); $newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire); $newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
@ -791,6 +791,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire); // if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
} }
// Supplier Orders
if (! empty($conf->fournisseur->enabled))
{
$langs->load("supplier");
$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
// if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
}
// Donations // Donations
if (! empty($conf->don->enabled)) if (! empty($conf->don->enabled))
{ {

8
htdocs/core/modules/export/export_excel.modules.php
View File

@ -191,6 +191,14 @@ class ExportExcel extends ModeleExports
} }
} }
if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
$cacheSettings = array (
'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
);
PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
}
$this->workbook = new PHPExcel(); $this->workbook = new PHPExcel();
$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION); $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
//$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION); //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);

4
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -100,8 +100,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->posxcomm=112; $this->posxcomm=112;
//$this->posxtva=112; //$this->posxtva=112;
//$this->posxup=126; //$this->posxup=126;
$this->posxqty=174; $this->posxqty=165;
$this->posxremainingqty=165; $this->posxremainingqty=185;
//$this->posxdiscount=162; //$this->posxdiscount=162;
//$this->postotalht=174; //$this->postotalht=174;
if ($this->page_largeur < 210) // To work with US executive format if ($this->page_largeur < 210) // To work with US executive format

24
htdocs/core/modules/modProduct.class.php
View File

@ -198,7 +198,7 @@ class modProduct extends DolibarrModules
$this->export_entities_array[$r][$fieldname]='product'; $this->export_entities_array[$r][$fieldname]='product';
} }
} }
// End add axtra fields // End add extra fields
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p'; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p';
@ -210,15 +210,14 @@ class modProduct extends DolibarrModules
{ {
// Exports product multiprice // Exports product multiprice
$r++; $r++;
//$this->export_code[$r]=$this->rights_class.'_'.$key; // FIXME $key is not defined $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_code[$r]=$this->rights_class;
$this->export_label[$r]="ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_label[$r]="ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("produit","export")); $this->export_permission[$r]=array(array("produit","export"));
$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref", $this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",
'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel", 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
'pr.price'=>"HT",'pr.price_ttc'=>"TTC", 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC", 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
'pr.tva_tx'=>'VATRate', 'pr.tva_tx'=>'PriceLevelVATRate',
'pr.date_price'=>'DateCreation'); 'pr.date_price'=>'DateCreation');
//$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date'); //$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product", $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
@ -305,11 +304,11 @@ class modProduct extends DolibarrModules
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price'); $this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price');
$this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author'); // Fields to store import user id $this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author'); // Fields to store import user id
$this->import_fields_array[$r]=array('pr.fk_product'=>"Id*", $this->import_fields_array[$r]=array('pr.fk_product'=>"ProductRowid*",
'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel", 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
'pr.price'=>"HT",'pr.price_ttc'=>"TTC", 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC", 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
'pr.tva_tx'=>'VATRate', 'pr.tva_tx'=>'PriceLevelVATRate',
'pr.date_price'=>'DateCreation*'); 'pr.date_price'=>'DateCreation*');
$this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); $this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
$this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1", $this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1",
@ -333,7 +332,6 @@ class modProduct extends DolibarrModules
*/ */
function init($options='') function init($options='')
{ {
// Permissions
$this->remove($options); $this->remove($options);
$sql = array(); $sql = array();

40
htdocs/core/modules/modService.class.php
View File

@ -60,7 +60,7 @@ class modService extends DolibarrModules
$this->picto='service'; $this->picto='service';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array("/produit/temp"); $this->dirs = array("/product/temp");
// Dependancies // Dependancies
$this->depends = array(); $this->depends = array();
@ -147,7 +147,7 @@ class modService extends DolibarrModules
if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service')); if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service'));
if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service')); if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service'));
// Add extra fields // Add extra fields
$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'"; $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example) if ($resql) // This can fail when class is used on old database (during migration for example)
{ {
@ -155,8 +155,28 @@ class modService extends DolibarrModules
{ {
$fieldname='extra.'.$obj->name; $fieldname='extra.'.$obj->name;
$fieldlabel=ucfirst($obj->label); $fieldlabel=ucfirst($obj->label);
$this->export_fields_array[$r][$fieldname]=$fieldlabel; $typeFilter="Text";
$this->export_entities_array[$r][$fieldname]='product'; switch($obj->type)
{
case 'int':
case 'double':
case 'price':
$typeFilter="Numeric";
break;
case 'date':
case 'datetime':
$typeFilter="Date";
break;
case 'boolean':
$typeFilter="Boolean";
break;
case 'sellist':
$typeFilter="List:".$obj->param;
break;
}
$this->export_fields_array[$r][$fieldname]=$fieldlabel;
$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
$this->export_entities_array[$r][$fieldname]='product';
} }
} }
// End add extra fields // End add extra fields
@ -164,7 +184,8 @@ class modService extends DolibarrModules
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p'; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')'; if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries) if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@ -186,7 +207,7 @@ class modService extends DolibarrModules
$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product", $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product", 'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product",
'pr.price_ttc'=>"product", 'pr.price_ttc'=>"product",
'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC", 'pr.price_min'=>"product",'pr.price_min_ttc'=>"product",
'pr.tva_tx'=>'product', 'pr.tva_tx'=>'product',
'pr.date_price'=>"product"); 'pr.date_price'=>"product");
$this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_start[$r]='SELECT DISTINCT ';
@ -208,10 +229,10 @@ class modService extends DolibarrModules
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields'); $this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author'); // Fields to store import user id $this->import_tables_creator_array[$r]=array('p'=>'fk_user_author'); // Fields to store import user id
$this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*'); $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode')); if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
// Add extra fields // Add extra fields
$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'"; $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example) if ($resql) // This can fail when class is used on old database (during migration for example)
{ {
@ -225,7 +246,7 @@ class modService extends DolibarrModules
// End add extra fields // End add extra fields
$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
$this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); $this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
$this->import_examplevalues_array[$r]=array('p.ref'=>"PR123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31'); $this->import_examplevalues_array[$r]=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries) if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@ -297,7 +318,6 @@ class modService extends DolibarrModules
*/ */
function init($options='') function init($options='')
{ {
// Permissions et valeurs par defaut
$this->remove($options); $this->remove($options);
$sql = array(); $sql = array();

7
htdocs/core/tpl/login.tpl.php
View File

@ -47,6 +47,8 @@ $(document).ready(function () {
<?php } ?> <?php } ?>
<center> <center>
<div class="login_vertical_align">
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>"> <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@ -197,7 +199,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php if (! empty($_SESSION['dol_loginmesg'])) <?php if (! empty($_SESSION['dol_loginmesg']))
{ {
?> ?>
<div class="center" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error"> <div class="center login_main_message" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
<?php echo $_SESSION['dol_loginmesg']; ?> <?php echo $_SESSION['dol_loginmesg']; ?>
</div></div> </div></div>
<?php <?php
@ -268,8 +270,11 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
} }
?> ?>
</div>
</center> <!-- end of center --> </center> <!-- end of center -->
</body> </body>
</html> </html>
<!-- END PHP TEMPLATE --> <!-- END PHP TEMPLATE -->

11
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -43,7 +43,10 @@ $(document).ready(function () {
</script> </script>
<?php } ?> <?php } ?>
<center> <center>
<div class="login_vertical_align">
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>"> <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>"> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
@ -132,7 +135,7 @@ if (! empty($hookmanager->resArray['options'])) {
</form> </form>
<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;"> <div class="center login_main_home" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php if ($mode == 'dolibarr' || ! $disabled) { ?> <?php if ($mode == 'dolibarr' || ! $disabled) { ?>
<font style="font-size: 12px;"> <font style="font-size: 12px;">
<?php echo $langs->trans('SendNewPasswordDesc'); ?> <?php echo $langs->trans('SendNewPasswordDesc'); ?>
@ -148,16 +151,16 @@ if (! empty($hookmanager->resArray['options'])) {
<br> <br>
<?php if ($message) { ?> <?php if ($message) { ?>
<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;"> <div class="center login_main_message" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php echo dol_htmloutput_mesg($message,'','',1); ?> <?php echo dol_htmloutput_mesg($message,'','',1); ?>
</div> </div>
<?php } ?> <?php } ?>
</div>
</center> <!-- end of center --> </center> <!-- end of center -->
<br>
</body> </body>
</html> </html>
<!-- END PHP TEMPLATE --> <!-- END PHP TEMPLATE -->

23
htdocs/expedition/card.php
View File

@ -7,6 +7,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr> * Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014 Francis Appels <francis.appels@yahoo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1434,12 +1435,25 @@ else if ($id || $ref)
$entrepot->fetch($lines[$i]->entrepot_id); $entrepot->fetch($lines[$i]->entrepot_id);
print $entrepot->getNomUrl(1); print $entrepot->getNomUrl(1);
} }
else if (count($lines[$i]->details_entrepot) > 1)
{
$detail = '';
foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
if ($detail_entrepot->entrepot_id > 0) {
$entrepot = new Entrepot($db);
$entrepot->fetch($detail_entrepot->entrepot_id);
$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
}
}
print $form->textwithtooltip($langs->trans("DetailWarehouseNumber"),$detail);
}
print '</td>'; print '</td>';
} }
// Batch number managment // Batch number managment
if (! empty($conf->productbatch->enabled)) { if (! empty($conf->productbatch->enabled)) {
if (isset($lines[$i]->detail_batch) ) { if (isset($lines[$i]->detail_batch) ) {
$flagBatch = true;
print '<td align="center">'; print '<td align="center">';
$detail = ''; $detail = '';
foreach ($lines[$i]->detail_batch as $dbatch) { foreach ($lines[$i]->detail_batch as $dbatch) {
@ -1529,7 +1543,14 @@ else if ($id || $ref)
if ($user->rights->expedition->supprimer) if ($user->rights->expedition->supprimer)
{ {
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>'; if (empty($conf->productbatch->enabled) || (!empty($conf->productbatch->enabled) && !$conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !isset($flagBatch))
{
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
}
else
{
print '<a class="butActionRefused" href="#">'.$langs->trans('Delete').'</a>';
}
} }
print '</div>'; print '</div>';

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

@ -7,6 +7,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr> * Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Francis Appels <francis.appels@yahoo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1068,7 +1069,7 @@ class Expedition extends CommonObject
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
$sql.= " WHERE ed.fk_expedition = ".$this->id; $sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND ed.fk_origin_line = cd.rowid"; $sql.= " AND ed.fk_origin_line = cd.rowid";
$sql.= " ORDER BY cd.rang"; $sql.= " ORDER BY cd.rang, ed.fk_origin_line";
dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG); dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -1078,6 +1079,8 @@ class Expedition extends CommonObject
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
$lineindex = 0;
$originline = 0;
$this->total_ht = 0; $this->total_ht = 0;
$this->total_tva = 0; $this->total_tva = 0;
@ -1087,13 +1090,25 @@ class Expedition extends CommonObject
while ($i < $num) while ($i < $num)
{ {
$line = new ExpeditionLigne($this->db);
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($originline == $obj->fk_origin_line) {
$line->entrepot_id = 0; // entrepod_id in details_entrepot
$line->qty_shipped += $obj->qty_shipped;
} else {
$line = new ExpeditionLigne($this->db);
$line->entrepot_id = $obj->fk_entrepot;
$line->qty_shipped = $obj->qty_shipped;
}
$detail_entrepot = new stdClass;
$detail_entrepot->entrepot_id = $obj->fk_entrepot;
$detail_entrepot->qty_shipped = $obj->qty_shipped;
$line->details_entrepot[] = $detail_entrepot;
$line->line_id = $obj->line_id; $line->line_id = $obj->line_id;
$line->fk_origin_line = $obj->fk_origin_line; $line->fk_origin_line = $obj->fk_origin_line;
$line->origin_line_id = $obj->fk_origin_line; // TODO deprecated $line->origin_line_id = $obj->fk_origin_line; // TODO deprecated
$line->entrepot_id = $obj->fk_entrepot;
$line->fk_product = $obj->fk_product; $line->fk_product = $obj->fk_product;
$line->fk_product_type = $obj->fk_product_type; $line->fk_product_type = $obj->fk_product_type;
$line->ref = $obj->product_ref; // TODO deprecated $line->ref = $obj->product_ref; // TODO deprecated
@ -1103,7 +1118,6 @@ class Expedition extends CommonObject
$line->label = $obj->custom_label; $line->label = $obj->custom_label;
$line->description = $obj->description; $line->description = $obj->description;
$line->qty_asked = $obj->qty_asked; $line->qty_asked = $obj->qty_asked;
$line->qty_shipped = $obj->qty_shipped;
$line->weight = $obj->weight; $line->weight = $obj->weight;
$line->weight_units = $obj->weight_units; $line->weight_units = $obj->weight_units;
$line->length = $obj->length; $line->length = $obj->length;
@ -1116,7 +1130,7 @@ class Expedition extends CommonObject
// For invoicing // For invoicing
$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type); // We force type to 0 $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type); // We force type to 0
$line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements) $line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements)
$line->qty = $obj->qty_shipped; $line->qty = $line->qty_shipped;
$line->total_ht = $tabprice[0]; $line->total_ht = $tabprice[0];
$line->total_localtax1 = $tabprice[9]; $line->total_localtax1 = $tabprice[9];
$line->total_localtax2 = $tabprice[10]; $line->total_localtax2 = $tabprice[10];
@ -1141,11 +1155,25 @@ class Expedition extends CommonObject
* May be conf is not well initialized for dark reason * May be conf is not well initialized for dark reason
*/ */
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
$line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id); if ($originline != $obj->fk_origin_line) {
$line->detail_batch = ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
} else {
$line->detail_batch = array_merge($line->detail_batch,ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id));
}
}
if ($originline != $obj->fk_origin_line) {
$this->lines[$lineindex] = $line;
$lineindex++;
} else {
$line->total_ht += $tabprice[0];
$line->total_localtax1 += $tabprice[9];
$line->total_localtax2 += $tabprice[10];
$line->total_ttc += $tabprice[2];
$line->total_tva += $tabprice[1];
} }
$this->lines[$i] = $line;
$i++; $i++;
$originline = $obj->fk_origin_line;
} }
$this->db->free($resql); $this->db->free($resql);
return 1; return 1;

132
htdocs/fourn/card.php
View File

@ -304,6 +304,28 @@ if ($object->fetch($id))
if ($user->rights->fournisseur->commande->lire) if ($user->rights->fournisseur->commande->lire)
{ {
// TODO move to DAO class
// Check if there are supplier orders billable
$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
$sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
$sql2.= ' WHERE c.fk_soc = s.rowid';
$sql2.= ' AND s.rowid = '.$object->id;
// Show orders with status validated, shipping started and delivered (well any order we can bill)
$sql2.= " AND c.fk_statut IN (5)";
// Find order that are not already invoiced
$sql2 .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
$resql2=$db->query($sql2);
if ($resql2) {
$orders2invoice = $db->num_rows($resql2);
$db->free($resql2);
} else {
setEventMessage($db->lasterror(),'errors');
}
// TODO move to DAO class // TODO move to DAO class
$sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut"; $sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p "; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
@ -436,60 +458,66 @@ if ($object->fetch($id))
if (empty($reshook)) if (empty($reshook))
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->rights->fournisseur->commande->creer) if ($user->rights->fournisseur->commande->creer)
{ {
$langs->load("orders"); $langs->load("orders");
print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
}
if ($user->rights->fournisseur->facture->creer)
{
$langs->load("bills");
print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
}
// Add action
if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
{
if ($user->rights->agenda->myactions->create)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
}
else
{
print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
}
}
print '</div>';
print '<br>';
if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
{
print '<br>';
// List of contacts
show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
// Addresses list
if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
{
$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
{
print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
// List of todo actions
show_actions_todo($conf,$langs,$db,$object);
// List of done actions
show_actions_done($conf,$langs,$db,$object);
}
} }
if ($user->rights->fournisseur->facture->creer)
{
$langs->load("bills");
print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
}
if ($user->rights->fournisseur->facture->creer)
{
if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
}
// Add action
if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
{
if ($user->rights->agenda->myactions->create)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
}
else
{
print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
}
}
print '</div>';
print '<br>';
if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
{
print '<br>';
// List of contacts
show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
// Addresses list
if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
{
$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
}
if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
{
print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
// List of todo actions
show_actions_todo($conf,$langs,$db,$object);
// List of done actions
show_actions_done($conf,$langs,$db,$object);
}
}
} }
else else
{ {

4
htdocs/fourn/commande/list.php
View File

@ -51,6 +51,8 @@ $socid = GETPOST('socid','int');
$sortorder = GETPOST('sortorder','alpha'); $sortorder = GETPOST('sortorder','alpha');
$sortfield = GETPOST('sortfield','alpha'); $sortfield = GETPOST('sortfield','alpha');
$viewstatut=GETPOST('viewstatut');
// Security check // Security check
$orderid = GETPOST('orderid'); $orderid = GETPOST('orderid');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
@ -256,6 +258,8 @@ if ($resql)
print "</table>\n"; print "</table>\n";
print "</form>\n"; print "</form>\n";
print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
$db->free($resql); $db->free($resql);
} }
else else

594
htdocs/fourn/commande/orderstoinvoice.php Normal file
View File

@ -0,0 +1,594 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Andreu Bisquerra Gaya <jove@bisquerra.com>
* Copyright (C) 2012 David Rodriguez Martinez <davidrm146@gmail.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/fourn/commande/orderstoinvoice.php
* \ingroup commande
* \brief Page to invoice multiple supplier orders
*/
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
}
$langs->load('orders');
$langs->load('deliveries');
$langs->load('companies');
if (! $user->rights->facture->creer)
accessforbidden();
$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
$sref = GETPOST('sref');
$sref_client = GETPOST('sref_client');
$sall = GETPOST('sall');
$socid = GETPOST('socid', 'int');
$selected = GETPOST('orders_to_invoice');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$viewstatut = GETPOST('viewstatut');
if (! $sortfield)
$sortfield = 'c.rowid';
if (! $sortorder)
$sortorder = 'DESC';
$now = dol_now();
$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
if ($action == 'create') {
if (is_array($selected) == false) {
$mesgs = array (
'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
);
} else {
$origin = GETPOST('origin');
$originid = GETPOST('originid');
}
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
$hookmanager = new HookManager($db);
$hookmanager->initHooks(array('orderstoinvoicesupplier'));
/*
* Actions
*/
if (($action == 'create' || $action == 'add') && empty($mesgs)) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
$langs->load('bills');
$langs->load('products');
$langs->load('main');
if (isset($_GET['orders_to_invoice'])) {
$orders_id = $_GET['orders_to_invoice'];
$n = count($orders_id);
$i = 0;
$originid = $orders_id[0];
$_GET['originid'] = $orders_id[0];
}
if (isset($_POST['orders_to_invoice'])) {
$orders_id = $_POST['orders_to_invoice'];
$nn = count($orders_id);
$ii = 0;
$originid = $orders_id[0];
$_POST['originid'] = $orders_id[0];
}
$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
$lineid = GETPOST('lineid', 'int');
$userid = GETPOST('userid', 'int');
$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
// Security check
if ($user->societe_id)
$socid = $user->societe_id;
$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
$object = new FactureFournisseur($db);
// Insert new invoice in database
if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
$object->socid = GETPOST('socid');
$db->begin();
$error = 0;
// Standard or deposit or proforma invoice
$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
if (empty($datefacture)) {
$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
}
if (! $error) {
$object->ref = $_POST['ref'];
$object->ref_supplier = $_POST['ref_supplier'];
$object->socid = $_POST['socid'];
$object->libelle = $_POST['libelle'];
$object->date = $datefacture;
$object->date_echeance = $datedue;
$object->note_public = GETPOST('note_public');
$object->note_private = GETPOST('note_private');
$object->cond_reglement_id = GETPOST('cond_reglement_id');
$object->mode_reglement_id = GETPOST('mode_reglement_id');
$projectid = GETPOST('projectid');
if ($projectid > 0)
$object->fk_project = $projectid;
// Auto calculation of date due if not filled by user
if (empty($object->date_echeance))
$object->date_echeance = $object->calculate_date_lim_reglement();
if ($_POST['origin'] && $_POST['originid']) {
$object->origin = $_POST['origin'];
$object->origin_id = $orders_id[$ii];
$object->linked_objects = $orders_id;
$id = $object->create($user);
if ($id > 0) {
foreach ( $orders_id as $origin => $origin_id ) {
$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
$db->begin();
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
$sql .= "fk_source";
$sql .= ", sourcetype";
$sql .= ", fk_target";
$sql .= ", targettype";
$sql .= ") VALUES (";
$sql .= $origin_id;
$sql .= ", '" . $object->origin . "'";
$sql .= ", " . $id;
$sql .= ", '" . $object->element . "'";
$sql .= ")";
if ($db->query($sql)) {
$db->commit();
} else {
$db->rollback();
}
}
while ( $ii < $nn ) {
$objectsrc = new CommandeFournisseur($db);
dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
$result = $objectsrc->fetch($orders_id[$ii]);
if ($result > 0) {
$lines = $objectsrc->lines;
if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
$objectsrc->fetch_lines();
$lines = $objectsrc->lines;
}
$fk_parent_line = 0;
$num = count($lines);
for($i = 0; $i < $num; $i ++) {
$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
// Dates
// TODO mutualiser
$date_start = $lines[$i]->date_debut_prevue;
if ($lines[$i]->date_debut_reel)
$date_start = $lines[$i]->date_debut_reel;
if ($lines[$i]->date_start)
$date_start = $lines[$i]->date_start;
$date_end = $lines[$i]->date_fin_prevue;
if ($lines[$i]->date_fin_reel)
$date_end = $lines[$i]->date_fin_reel;
if ($lines[$i]->date_end)
$date_end = $lines[$i]->date_end;
// Reset fk_parent_line for no child products and special product
if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
$fk_parent_line = 0;
}
// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
if ($result > 0) {
$lineid = $result;
} else {
$lineid = 0;
$error ++;
break;
}
// Defined the new fk_parent_line
if ($result > 0 && $lines[$i]->product_type == 9) {
$fk_parent_line = $result;
}
}
} else {
$mesgs[] = $objectsrc->error;
$error ++;
}
$ii ++;
}
} else {
$mesgs[] = $object->error;
$error ++;
}
}
}
// End of object creation, we show it
if ($id > 0 && ! $error) {
$db->commit();
header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
exit();
} else {
$db->rollback();
$action = 'create';
$_GET["origin"] = $_POST["origin"];
$_GET["originid"] = $_POST["originid"];
$mesgs[] = '<div class="error">' . $object->error . '</div>';
}
}
}
/*
* View
*/
$html = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$companystatic = new Societe($db);
// Mode creation
if ($action == 'create' && empty($mesgs)) {
llxHeader();
print_fiche_titre($langs->trans('NewBill'));
$soc = new Societe($db);
if ($socid)
$res = $soc->fetch($socid);
if ($res) {
$cond_reglement_id = $soc->cond_reglement_id;
$mode_reglement_id = $soc->mode_reglement_id;
}
$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
print '<input name="facnumber" type="hidden" value="provisoire">';
print '<input name="ref_client" type="hidden" value="' . $ref_client . '">';
print '<input name="ref_int" type="hidden" value="' . $ref_int . '">';
print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
print '<table class="border" width="100%">';
// Ref
print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
// Ref supplier
print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
print '</tr>';
// Third party
print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
print $soc->getNomUrl(1);
print '<input type="hidden" name="socid" value="' . $soc->id . '">';
print '</td>';
print '</tr>' . "\n";
// Date invoice
print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
$html->select_date('', '', '', '', '', "add", 1, 1);
print '</td></tr>';
// Payment term
print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
print '</td></tr>';
// Payment mode
print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
print '</td></tr>';
// Project
if (! empty($conf->projet->enabled)) {
$formproject = new FormProjets($db);
$langs->load('projects');
print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
$formproject->select_projects($soc->id, $projectid, 'projectid');
print '</td></tr>';
}
$objectsrc = new CommandeFournisseur($db);
$listoforders = array ();
foreach ( $selected as $sel ) {
$result = $objectsrc->fetch($sel);
if ($result > 0) {
$listoforders[] = $objectsrc->ref;
}
}
// Other attributes
$parameters = array (
'objectsrc' => $objectsrc,
'idsrc' => $listoforders,
'colspan' => ' colspan="3"'
);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
// Modele PDF
print '<tr><td>' . $langs->trans('Model') . '</td>';
print '<td>';
$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
print "</td></tr>";
// Public note
print '<tr>';
print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
print '</textarea></td></tr>';
// Private note
if (empty($user->societe_id)) {
print '<tr>';
print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
print '</textarea></td></tr>';
}
print '</table>';
while ( $i < $n ) {
print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
$i ++;
}
// Button "Create Draft"
print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></center>';
print "</form>\n";
print '</td></tr>';
print "</table>\n";
}
// Mode liste
if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
llxHeader();
?>
<script type="text/javascript">
jQuery(document).ready(function() {
jQuery("#checkall").click(function() {
jQuery(".checkformerge").attr('checked', true);
});
jQuery("#checknone").click(function() {
jQuery(".checkformerge").attr('checked', false);
});
});
</script>
<?php
$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
$sql .= ', ' . MAIN_DB_PREFIX . 'commande_fournisseur as c';
if (! $user->rights->societe->client->voir && ! $socid)
$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
$sql .= ' WHERE c.entity = ' . $conf->entity;
$sql .= ' AND c.fk_soc = s.rowid';
// Show orders with status validated, shipping started and delivered (well any order we can bill)
$sql .= " AND c.fk_statut IN (5)";
// Find order that are not already invoiced
$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
if ($socid)
$sql .= ' AND s.rowid = ' . $socid;
if (! $user->rights->societe->client->voir && ! $socid)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
if ($sref) {
$sql .= " AND c.ref LIKE '%" . $db->escape($sref) . "%'";
}
if ($sall) {
$sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
}
// Date filter
if ($date_start && $date_end)
$sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
if ($date_starty && $date_endy)
$sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
if (! empty($sref_client)) {
$sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
}
$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
$resql = $db->query($sql);
if ($resql) {
if ($socid) {
$soc = new Societe($db);
$soc->fetch($socid);
}
$title = $langs->trans('ListOfSupplierOrders');
$title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort');
$num = $db->num_rows($resql);
print_fiche_titre($title);
$i = 0;
$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
if (! empty($socid)) {
// Company
$companystatic->id = $socid;
$companystatic->nom = $soc->nom;
print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
}
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans('RefSupplier'), 'orderstoinvoice.php', 'c.ref_supplier', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
print_liste_field_titre($langs->trans('OrderDate'), 'orderstoinvoice.php', 'c.date_commande', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
print '</tr>';
// Lignes des champs de filtre
print '<form method="get" action="orderstoinvoice.php">';
print '<input type="hidden" name="socid" value="' . $socid . '">';
print '<tr class="liste_titre">';
print '<td class="liste_titre">';
// REF
print '<input class="flat" size="10" type="text" name="sref" value="' . $sref . '">';
print '</td>';
// print '<td class="liste_titre">';
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
// DATE ORDER
print '<td class="liste_titre" align="center">';
print $period;
print '</td>';
// DATE DELIVERY
print '<td class="liste_titre" align="center">';
print $periodely;
print '</td>';
// SEARCH BUTTON
print '</td><td align="right" class="liste_titre">';
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")) . '">';
// ALL/NONE
print '<td class="liste_titre" align="center">';
if ($conf->use_javascript_ajax)
print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
print '</td>';
print '</td></tr>';
print '</form>';
print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
$var = True;
$generic_commande = new CommandeFournisseur($db);
while ( $i < $num ) {
$objp = $db->fetch_object($resql);
$var = ! $var;
print '<tr ' . $bc[$var] . '>';
print '<td class="nowrap">';
$generic_commande->id = $objp->rowid;
$generic_commande->ref = $objp->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td class="nobordernopadding nowrap">';
print $generic_commande->getNomUrl(1, $objp->fk_statut);
print '</td>';
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename = dol_sanitizeFileName($objp->ref);
$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $objp->rowid;
print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
print '</td></tr></table>';
print '</td>';
print '<td>' . $objp->ref_supplier . '</td>';
// Order date
print '<td align="center" nowrap>';
print dol_print_date($db->jdate($objp->date_commande), 'day');
print '</td>';
// Delivery date
print '<td align="center" nowrap>';
print dol_print_date($db->jdate($objp->date_livraison), 'day');
print '</td>';
// Statut
print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
// Checkbox
print '<td align="center">';
print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
print '</td>';
print '</tr>';
$total = $total + $objp->price;
$subtotal = $subtotal + $objp->price;
$i ++;
}
print '</table>';
/*
* Boutons actions
*/
print '<center>';
print '<div align="right">';
print '<input type="hidden" name="socid" value="' . $socid . '">';
print '<input type="hidden" name="action" value="create">';
print '<input type="hidden" name="origin" value="commande"><br>';
// print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
print '</div>';
print '</form>';
$db->free($resql);
} else {
print dol_print_error($db);
}
}
dol_htmloutput_mesg($mesg, $mesgs);
llxFooter();
$db->close();

2
htdocs/install/default.css
View File

@ -180,7 +180,7 @@ margin-top: 10px;
font-size:16px; font-size:16px;
font-weight: normal; font-weight: normal;
color: #4965B3; color: #4965B3;
text-shadow: 2px 1px 2px #c0c0c0; text-shadow: 1px 1px 1px #c0c0c0;
} }
tr.bg1 { tr.bg1 {

4
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@ -74,7 +74,7 @@ ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL
ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number; ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number;
ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid; ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity; ALTER TABLE llx_accountingaccount add column datec datetime AFTER entity;
ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label;
ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;
@ -204,7 +204,7 @@ create table llx_accounting_fiscalyear
)ENGINE=innodb; )ENGINE=innodb;
ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref; ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref;
ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30) after ref_ext; ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext;
ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison; ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison;
ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison; ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison;

2
htdocs/langs/de_DE/banks.lang
View File

@ -133,7 +133,7 @@ CashBudget=Bargeldbestand
PlannedTransactions=Geplante Transaktionen PlannedTransactions=Geplante Transaktionen
Graph=Grafiken Graph=Grafiken
ExportDataset_banque_1=Bankbewegungen und Kontoauszug ExportDataset_banque_1=Bankbewegungen und Kontoauszug
ExportDataset_banque_2=Deposit slip ExportDataset_banque_2=Einzahlungsbeleg
TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
TransactionWithOtherAccount=Konto Transaktion TransactionWithOtherAccount=Konto Transaktion
PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert

8
htdocs/langs/de_DE/bills.lang
View File

@ -85,7 +85,7 @@ ClassifyPaid=Als 'bezahlt' markieren
ClassifyPaidPartially=Als 'teilweise bezahlt' markieren ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
ClassifyCanceled=Als 'storniert' markieren ClassifyCanceled=Als 'storniert' markieren
ClassifyClosed=Als 'geschlossen' markieren ClassifyClosed=Als 'geschlossen' markieren
ClassifyUnBilled=Classify 'Unbilled' ClassifyUnBilled=Als "nicht verrechnet" markieren
CreateBill=Erstelle Rechnung CreateBill=Erstelle Rechnung
AddBill=Rechnung/Gutschrift erstellen AddBill=Rechnung/Gutschrift erstellen
AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen
@ -198,8 +198,8 @@ Rest=Ausstehend
AmountExpected=Höhe der Forderung AmountExpected=Höhe der Forderung
ExcessReceived=Erhaltener Überschuss ExcessReceived=Erhaltener Überschuss
EscompteOffered=Rabatt angeboten (Skonto) EscompteOffered=Rabatt angeboten (Skonto)
SendBillRef=Submission of invoice %s SendBillRef=Einreichung der Rechnung %s
SendReminderBillRef=Submission of invoice %s (reminder) SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
StandingOrders=Daueraufträge StandingOrders=Daueraufträge
StandingOrder=Dauerauftrag StandingOrder=Dauerauftrag
NoDraftBills=Keine Rechnungsentwürfe NoDraftBills=Keine Rechnungsentwürfe
@ -398,7 +398,7 @@ ToMakePayment=Bezahlen
ToMakePaymentBack=Rückzahlung ToMakePaymentBack=Rückzahlung
ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind. NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
RevenueStamp=Revenue stamp RevenueStamp=Steuermarke
YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage) PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist

2
htdocs/langs/de_DE/companies.lang
View File

@ -93,7 +93,7 @@ LocalTax1ES=RE
LocalTax2ES=IRPF LocalTax2ES=IRPF
TypeLocaltax1ES=RE Type TypeLocaltax1ES=RE Type
TypeLocaltax2ES=IRPF Type TypeLocaltax2ES=IRPF Type
TypeES=Type TypeES=Typ
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Kunden-Code ungültig WrongCustomerCode=Kunden-Code ungültig
WrongSupplierCode=Lieferanten-Code ungültig WrongSupplierCode=Lieferanten-Code ungültig

20
htdocs/langs/de_DE/compta.lang
View File

@ -19,7 +19,7 @@ AmountToBeCharged=Zu zahlender Gesamtbetrag:
AccountsGeneral=Konten AccountsGeneral=Konten
Account=Konto Account=Konto
Accounts=Konten Accounts=Konten
Accountparent=Account parent Accountparent=Kontohalter
Accountsparent=Accounts parent Accountsparent=Accounts parent
BillsForSuppliers=Lieferantenrechnungen BillsForSuppliers=Lieferantenrechnungen
Income=Einnahmen Income=Einnahmen
@ -182,7 +182,7 @@ Pcg_version=Pcg version
Pcg_type=Pcg type Pcg_type=Pcg type
Pcg_subtype=Pcg subtype Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch InvoiceLinesToDispatch=Invoice lines to dispatch
InvoiceDispatched=Dispatched invoices InvoiceDispatched=Versandte Rechnungen
AccountancyDashboard=Accountancy summary AccountancyDashboard=Accountancy summary
ByProductsAndServices=Nach Produkten und Services ByProductsAndServices=Nach Produkten und Services
RefExt=Externe Referenz RefExt=Externe Referenz
@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module). TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=Berechnungsmodus CalculationMode=Berechnungsmodus
AccountancyJournal=Accountancy code journal AccountancyJournal=Accountancy code journal
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen
ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen
ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties

6
htdocs/langs/de_DE/contracts.lang
View File

@ -88,9 +88,9 @@ NoExpiredServices=Keine abgelaufen aktiven Dienste
ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen
ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind
ListOfServicesToExpire=Liste der Services die ablaufen ListOfServicesToExpire=Liste der Services die ablaufen
NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind.
StandardContractsTemplate=Standard contracts template StandardContractsTemplate=Standard Vertragsschablone
ContactNameAndSignature=For %s, name and signature: ContactNameAndSignature=Für %s, Name und Unterschrift
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter

16
htdocs/langs/de_DE/errors.lang
View File

@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - errors # Dolibarr language file - Source file is en_US - errors
# No errors # No errors
NoErrorCommitIsDone=No error, we commit NoErrorCommitIsDone=Kein Fehler, wir führen fort
# Errors # Errors
Error=Fehler Error=Fehler
Errors=Fehler Errors=Fehler
ErrorButCommitIsDone=Errors found but we validate despite this ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
ErrorBadEMail=E-Mail %s ist nicht korrekt ErrorBadEMail=E-Mail %s ist nicht korrekt
ErrorBadUrl=URL %s ist nicht korrekt ErrorBadUrl=URL %s ist nicht korrekt
ErrorLoginAlreadyExists=Login %s existiert bereits. ErrorLoginAlreadyExists=Login %s existiert bereits.
@ -63,7 +63,7 @@ ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den T
ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben
ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben
ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores ErrorBadFormatValueList=Die Liste darf nicht mehr als ein <u>%s</u> enthalten, muss aber mindestens eines aus "llave,valores" beinhalten
ErrorFieldCanNotContainSpecialCharacters=Das Feld <b>%s</b> darf keine Sonderzeichen enthalten. ErrorFieldCanNotContainSpecialCharacters=Das Feld <b>%s</b> darf keine Sonderzeichen enthalten.
ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf weder Sonderzeichen noch Großbuchstaben enthalten. ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf weder Sonderzeichen noch Großbuchstaben enthalten.
ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert
@ -134,8 +134,10 @@ ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt
ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
ErrorBadFormat=Falsches Format! ErrorBadFormat=Falsches Format!
ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s. ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s.
ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich. ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich.
ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
# Warnings # Warnings
WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
@ -149,8 +151,8 @@ WarningsOnXLines=Warnhinweise in <b>%s</b> Quellzeilen
WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmäßig ausgewählt, bis Sie die Moduleinstellungen angepasst haben. WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmäßig ausgewählt, bis Sie die Moduleinstellungen angepasst haben.
WarningLockFileDoesNotExists=Warnung, wenn Setup abgeschlossen ist, müssen Sie die Installations- und Migration-Tools deaktivieren. Dazu fügen Sie die Datei <b>install.lock</b> dem Verzeichnis <b> %s</b> hinzu. Das fehlend dieser Datei stelle eine Sicherheitslücke dar. WarningLockFileDoesNotExists=Warnung, wenn Setup abgeschlossen ist, müssen Sie die Installations- und Migration-Tools deaktivieren. Dazu fügen Sie die Datei <b>install.lock</b> dem Verzeichnis <b> %s</b> hinzu. Das fehlend dieser Datei stelle eine Sicherheitslücke dar.
WarningUntilDirRemoved=Diese Warnung bleibt so lange bestehen, bis die Sicherheitslücke geschlossen wurde (nur für Administratoren sichtbar). WarningUntilDirRemoved=Diese Warnung bleibt so lange bestehen, bis die Sicherheitslücke geschlossen wurde (nur für Administratoren sichtbar).
WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. WarningCloseAlways=Achtung: es wird auch dann geschlossen, wenn der Betrag zwischen Quelle und Ziel unterschiedlich ist. Aktivieren Sie dieses Feature mit Bedacht.
WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtliche Seiten mit dieser Box spürbar. WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtliche Seiten mit dieser Box spürbar.
WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte). WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte).
WarningNotRelevant=Irrelevant operation for this dataset WarningNotRelevant=Operation für dieses Daten-Set nicht relevant
WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist.

2
htdocs/langs/de_DE/help.lang
View File

@ -25,4 +25,4 @@ LinkToGoldMember=Sie können einen, vom System für Ihre Sprache (%s) automatisc
PossibleLanguages=Unterstützte Sprachen PossibleLanguages=Unterstützte Sprachen
MakeADonation=Unterstützen Sie das Projekt über eine Spende MakeADonation=Unterstützen Sie das Projekt über eine Spende
SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende. SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende.
# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b> SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br><b><a href="%s" target="_blank">%s</a></b>

54
htdocs/langs/de_DE/holiday.lang
View File

@ -1,40 +1,40 @@
# Dolibarr language file - Source file is en_US - holiday # Dolibarr language file - Source file is en_US - holiday
HRM=Mitarbeiter HRM=Mitarbeiter
Holidays=Ferien Holidays=Urlaub
CPTitreMenu=Ferien CPTitreMenu=Urlaub
MenuReportMonth=Monatsauszug MenuReportMonth=Monatsauszug
MenuAddCP=Ferienantrag MenuAddCP=Urlaubsantrag
NotActiveModCP=Sie müssen das Ferien-Modul aktivieren um diese Seite zu sehen. NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen.
NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klicken Sie hier </ a>. NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klicken Sie hier </ a>.
NoCPforUser=You don't have a demand for holidays. NoCPforUser=Sie haben keinen Anspruch auf Urlaub
AddCP=Ferienantrag AddCP=Urlaubsantrag
Employe=Angestellter Employe=Mitarbeiter
DateDebCP=Ferienbeginn DateDebCP=Urlaubsbeginn
DateFinCP=Ferienende DateFinCP=Urlaubsende
DateCreateCP=Erstellungsdatum DateCreateCP=Erstellungsdatum
DraftCP=Entwurf DraftCP=Entwurf
ToReviewCP=Wartet auf Genehmigung ToReviewCP=Wartet auf Genehmigung
ApprovedCP=Genehmigt ApprovedCP=Genehmigt
CancelCP=Storno CancelCP=Zurückgezogen
RefuseCP=Abgelehnt RefuseCP=Abgelehnt
ValidatorCP=genehmigt durch ValidatorCP=genehmigt durch
ListeCP=Ferienliste ListeCP=Urlaubsliste
ReviewedByCP=Wird geprüft von ReviewedByCP=Wird geprüft von
DescCP=Beschreibung DescCP=Beschreibung
SendRequestCP=Ferienantrag stellen SendRequestCP=Urlaubsantrag erstellen
DelayToRequestCP=Anträge für Ferien müssen mindestens <b>%s Tage</b> im voraus gestellt werden. DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
MenuConfCP=Edit balance of holidays MenuConfCP=Bearbeiten Sie die Urlaubsliste
UpdateAllCP=Ferien aktualisieren UpdateAllCP=Urlaub aktualisieren
SoldeCPUser=Feriensaldo ist <b>%s</b> Tage. SoldeCPUser=Urlaubssaldo ist <b>%s</b> Tage.
ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt. ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt.
ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von: ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von:
ErrorIDFicheCP=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht. ErrorIDFicheCP=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht.
ReturnCP=Zurück zur vorherigen Seite ReturnCP=Zurück zur vorherigen Seite
ErrorUserViewCP=Sie sind nicht berechtigt diese Ferien-Anträge zu lesen. ErrorUserViewCP=Sie sind nicht berechtigt diese Urlaubsanträge zu lesen.
InfosCP=Information of the demand of holidays InfosCP=Information über den Urlaubsantrag
InfosWorkflowCP=Information Workflow InfosWorkflowCP=Information Workflow
RequestByCP=Beantragt von RequestByCP=Beantragt von
TitreRequestCP=Sheet of holidays TitreRequestCP=Urlaubstabelle
NbUseDaysCP=Anzahl Ferientage bezogen NbUseDaysCP=Anzahl Ferientage bezogen
EditCP=Bearbeiten EditCP=Bearbeiten
DeleteCP=Lösche Gruppe DeleteCP=Lösche Gruppe
@ -47,15 +47,15 @@ TitleDeleteCP=Antrag auf Ferien löschen
ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen? ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen?
ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen. ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen.
CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen. CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen.
InvalidValidatorCP=You must choose an approbator to your holiday request. InvalidValidatorCP=Sie müssen einen Vorgesetzten haben der Ihre Urlaubsanfrage genehmigt.
UpdateButtonCP=Aktualisieren UpdateButtonCP=Aktualisieren
CantUpdate=You cannot update this request of holidays. CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren
NoDateDebut=Sie müssen ein Startdatum wählen. NoDateDebut=Sie müssen ein Startdatum wählen.
NoDateFin=Sie müssen ein Enddatum wählen. NoDateFin=Sie müssen ein Enddatum wählen.
ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage. ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage.
TitleValidCP=Approve the request holidays TitleValidCP=Urlaubsantrag genehmigen
ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen? ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen?
DateValidCP=Date approved DateValidCP=Datum genehmigt
TitleToValidCP=Ferienantrag senden TitleToValidCP=Ferienantrag senden
ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden? ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden?
TitleRefuseCP=Ferienantrag ablehnen TitleRefuseCP=Ferienantrag ablehnen
@ -65,14 +65,14 @@ TitleCancelCP=Ferienantrag abbrechen
ConfirmCancelCP=Möchten Sie diesen Ferienantrag wirklich abbrechen? ConfirmCancelCP=Möchten Sie diesen Ferienantrag wirklich abbrechen?
DetailRefusCP=Ablehnungsgrund DetailRefusCP=Ablehnungsgrund
DateRefusCP=Datum der Ablehnung DateRefusCP=Datum der Ablehnung
DateCancelCP=Date of cancellation DateCancelCP=Datum der Absage
DefineEventUserCP=Assign an exceptional leave for a user DefineEventUserCP=Assign an exceptional leave for a user
addEventToUserCP=Assign leave addEventToUserCP=Assign leave
MotifCP=Grund MotifCP=Grund
UserCP=Benutzer UserCP=Benutzer
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
AddEventToUserOkCP=The addition of the exceptional leave has been completed. AddEventToUserOkCP=The addition of the exceptional leave has been completed.
MenuLogCP=View logs of holidays MenuLogCP=Urlaubsliste ansehen
LogCP=Liste von neuen Ferieneinträgen LogCP=Liste von neuen Ferieneinträgen
ActionByCP=Ausgeführt von ActionByCP=Ausgeführt von
UserUpdateCP=Für den Benutzer UserUpdateCP=Für den Benutzer
@ -85,7 +85,7 @@ FirstDayOfHoliday=Erster Ferientag
LastDayOfHoliday=Letzter Ferientag LastDayOfHoliday=Letzter Ferientag
HolidaysMonthlyUpdate=Monatliches Update HolidaysMonthlyUpdate=Monatliches Update
ManualUpdate=Manuelles Update ManualUpdate=Manuelles Update
HolidaysCancelation=Holidays cancelation HolidaysCancelation=Urlaubsstornierung
## Configuration du Module ## ## Configuration du Module ##
ConfCP=Konfiguration des Ferienmoduls ConfCP=Konfiguration des Ferienmoduls
@ -125,7 +125,7 @@ TitleUpdateEventCP=Edit or delete a exceptional leave
DeleteEventOptionCP=Lösche Gruppe DeleteEventOptionCP=Lösche Gruppe
UpdateEventOptionCP=Aktualisieren UpdateEventOptionCP=Aktualisieren
ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten: ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
NoCPforMonth=No leave this month. NoCPforMonth=Kein Urlaub diesen Monat
nbJours=Anzahl der Tage nbJours=Anzahl der Tage
TitleAdminCP=Konfiguration der Ferien TitleAdminCP=Konfiguration der Ferien
#Messages #Messages

4
htdocs/langs/de_DE/interventions.lang
View File

@ -25,9 +25,11 @@ NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe
InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen
ClassifyBilled=Eingegordnet "Angekündigt" ClassifyBilled=Eingegordnet "Angekündigt"
ClassifyUnBilled=als "nicht verrechnet" markieren
StatusInterInvoiced=Angekündigt StatusInterInvoiced=Angekündigt
RelatedInterventions=Verbundene Eingriffe RelatedInterventions=Verbundene Eingriffe
ShowIntervention=Zeige Eingriffe ShowIntervention=Zeige Eingriffe
SendInterventionRef=Einreichung von Eingriffen %s
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter
TypeContact_fichinter_internal_INTERVENING=Eingriff läuft TypeContact_fichinter_internal_INTERVENING=Eingriff läuft
@ -39,4 +41,4 @@ ArcticNumRefModelError=Fehler beim aktivieren
PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist
PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen. PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen.
PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte
# PrintProductsOnFichinterDetails=forinterventions generated from orders PrintProductsOnFichinterDetails=forinterventions generated from orders

16
htdocs/langs/de_DE/link.lang
View File

@ -1,8 +1,8 @@
LinkANewFile=Link a new file/document LinkANewFile=Verknüpfen Sie ein neues Dokument/Datei
LinkedFiles=Linked files and documents LinkedFiles=Verknüpfte Dateien und Dokumente
NoLinkFound=No registered links NoLinkFound=Keine eingetragenen Verknüpfungen
LinkComplete=The file has been linked successfully LinkComplete=Die Datei wurde erfolgreich verknüpft
ErrorFileNotLinked=The file could not be linked ErrorFileNotLinked=Die Datei konnte nicht Verknüpft werden
LinkRemoved=The link %s has been removed LinkRemoved=Die Verknüpfung %s wurde entfernt
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>' ErrorFailedToDeleteLink= Fehler beim Löschen des Links '<b>%s</b>'
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>' ErrorFailedToUpdateLink= Fehler beim Aktualisieren der Verknüpfung '<b>%s</b>'

40
htdocs/langs/de_DE/mailmanspip.lang
View File

@ -1,27 +1,27 @@
# Dolibarr language file - Source file is en_US - mailmanspip # Dolibarr language file - Source file is en_US - mailmanspip
MailmanSpipSetup=Konfiguration Mailman und SPIP Modul MailmanSpipSetup=Konfiguration Mailman und SPIP Modul
# MailmanTitle=Mailman mailing list system MailmanTitle=Mailman mailing list system
# TestSubscribe=To test subscription to Mailman lists TestSubscribe=To test subscription to Mailman lists
# TestUnSubscribe=To test unsubscribe from Mailman lists TestUnSubscribe=To test unsubscribe from Mailman lists
# MailmanCreationSuccess=Subscription test was executed succesfully MailmanCreationSuccess=Subscription test was executed succesfully
# MailmanDeletionSuccess=Unsubscription test was executed succesfully MailmanDeletionSuccess=Unsubscription test was executed succesfully
# SynchroMailManEnabled=A Mailman update will be performed SynchroMailManEnabled=A Mailman update will be performed
# SynchroSpipEnabled=A Spip update will be performed SynchroSpipEnabled=A Spip update will be performed
# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
SPIPTitle=SPIP Content Management System SPIPTitle=SPIP Content Management System
DescADHERENT_SPIP_SERVEUR=SPIP-Server DescADHERENT_SPIP_SERVEUR=SPIP-Server
DescADHERENT_SPIP_DB=SPIP-Datenbankname DescADHERENT_SPIP_DB=SPIP-Datenbankname
DescADHERENT_SPIP_USER=SPIP-Datenbankkennung DescADHERENT_SPIP_USER=SPIP-Datenbankkennung
DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort
# AddIntoSpip=Add into SPIP AddIntoSpip=Add into SPIP
# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
# AddIntoSpipError=Failed to add the user in SPIP AddIntoSpipError=Failed to add the user in SPIP
# DeleteIntoSpip=Remove from SPIP DeleteIntoSpip=Von SPIP entfernen
# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
# DeleteIntoSpipError=Failed to suppress the user from SPIP DeleteIntoSpipError=Failed to suppress the user from SPIP
# SPIPConnectionFailed=Failed to connect to SPIP SPIPConnectionFailed=Failed to connect to SPIP
# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done

4
htdocs/langs/de_DE/margins.lang
View File

@ -5,9 +5,9 @@ Margins=Gewinnspannen
TotalMargin=Gesamt-Spanne TotalMargin=Gesamt-Spanne
MarginOnProducts=Gewinnspanne / Produkte MarginOnProducts=Gewinnspanne / Produkte
MarginOnServices=Gewinnspanne / Services MarginOnServices=Gewinnspanne / Services
MarginRate=Margin rate MarginRate=Gewinnspannen-Rate
MarkRate=Mark rate MarkRate=Mark rate
DisplayMarginRates=Display margin rates DisplayMarginRates=Zeige Gewinnspannen-Raten an
DisplayMarkRates=Display mark rates DisplayMarkRates=Display mark rates
InputPrice=Eingabe Preis InputPrice=Eingabe Preis
margin=Profit margins management margin=Profit margins management

15
htdocs/langs/de_DE/orders.lang
View File

@ -55,7 +55,7 @@ DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt
MenuOrdersToBill=Bestellverrechnung MenuOrdersToBill=Bestellverrechnung
MenuOrdersToBill2=Zu verrechnende Bestellungen MenuOrdersToBill2=Zu verrechnende Bestellungen
SearchOrder=Suche Bestellung SearchOrder=Suche Bestellung
# SearchACustomerOrder=Search a customer order SearchACustomerOrder=Kundenauftrag suchen
ShipProduct=Produkt versenden ShipProduct=Produkt versenden
Discount=Rabatt Discount=Rabatt
CreateOrder=Erzeuge Bestellung CreateOrder=Erzeuge Bestellung
@ -101,7 +101,6 @@ RelatedOrders=Verknüpfte Bestellungen
OnProcessOrders=Bestellungen in Bearbeitung OnProcessOrders=Bestellungen in Bearbeitung
RefOrder=Bestell-Nr. RefOrder=Bestell-Nr.
RefCustomerOrder=Kunden-Bestellung-Nr. RefCustomerOrder=Kunden-Bestellung-Nr.
CustomerOrder=Kundenbestellung
RefCustomerOrderShort=Kunden-BestellNr. RefCustomerOrderShort=Kunden-BestellNr.
SendOrderByMail=Bestellung per Post versenden SendOrderByMail=Bestellung per Post versenden
ActionsOnOrder=Maßnahmen zu dieser Bestellung ActionsOnOrder=Maßnahmen zu dieser Bestellung
@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstante COMMANDE_ADDON nicht definiert
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Fehler beim Laden der Moduldatei '%s' Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Fehler beim Laden der Moduldatei '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Fehler beim Laden der Moduldatei '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Fehler beim Laden der Moduldatei '%s'
Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt
# Sources # Sources
OrderSource0=Angebot OrderSource0=Angebot
OrderSource1=Internet OrderSource1=Internet
@ -144,7 +141,6 @@ OrderSource5=Vertrieb
OrderSource6=Andere OrderSource6=Andere
QtyOrdered=Bestellmenge QtyOrdered=Bestellmenge
AddDeliveryCostLine=Fügen Sie eine Versandkostenzeile zur Erfassung des Bestellgewichts ein AddDeliveryCostLine=Fügen Sie eine Versandkostenzeile zur Erfassung des Bestellgewichts ein
# Documents models # Documents models
PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, uwm.) PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, uwm.)
PDFEdisonDescription=Eine einfache Bestellungsvorlage PDFEdisonDescription=Eine einfache Bestellungsvorlage
@ -155,14 +151,13 @@ OrderByFax=Fax
OrderByEMail=E-Mail OrderByEMail=E-Mail
OrderByWWW=Online OrderByWWW=Online
OrderByPhone=Telefon OrderByPhone=Telefon
CreateInvoiceForThisCustomer=Bill orders
# CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig
# NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet". CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet".
MenuOrdersToBill2=Zu verrechnende Bestellungen MenuOrdersToBill2=Zu verrechnende Bestellungen
# OrderCreation=Order creation OrderCreation=Erstellen einer Bestellung
Ordered=Bestellt Ordered=Bestellt
OrderCreated=Ihre Bestellungen wurden erstellt OrderCreated=Ihre Bestellungen wurden erstellt
OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf
CreateOrders=Erzeuge Bestellungen CreateOrders=Erzeuge Bestellungen
# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und dann wählen Sie "%s".

6
htdocs/langs/de_DE/paypal.lang
View File

@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sie befinden sich im &quot;Sandbox&quot;-Modus
NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten
NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen
PAYPAL_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht) PAYPAL_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
ReturnURLAfterPayment=Return URL after payment ReturnURLAfterPayment=Rückkehr-URL nach Zahlung
ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed ValidationOfPaypalPaymentFailed=Validierung der Paypal-Zahlung gescheitert
PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed PaypalConfirmPaymentPageWasCalledButFailed=Zahlungsbestätigungsseite für Paypal wurde von Paypal aufgerufen, aber Bestätigung fehlgeschlagen

98
htdocs/langs/de_DE/products.lang
View File

@ -1,46 +1,46 @@
# Dolibarr language file - Source file is en_US - products # Dolibarr language file - Source file is en_US - products
ProductRef=Produktreferenz ProductRef=Produktreferenz
ProductLabel=Produkt-Beschriftung ProductLabel=Produkt-Beschriftung
ProductServiceCard=Produkt-/Services-Karte ProductServiceCard=Produkt-/Dienstleistungs-Karte
Products=Produkte Products=Produkte
Services=Services Services=Dienstleistungen
Product=Produkt Product=Produkt
Service=Service Service=Dienstleistung
ProductId=Produkt/Service ID ProductId=Produkt/Dienstleistungs ID
Create=Erstelle Create=Erstelle
Reference=Referenz Reference=Referenz
NewProduct=Neues Produkt NewProduct=Neues Produkt
NewService=Neuer Service NewService=Neue Dienstleistung
ProductCode=Produkt-Code ProductCode=Produkt-Code
ServiceCode=Service-Code ServiceCode=Dienstleistungs-Code
ProductVatMassChange=MwSt-Massenänderung ProductVatMassChange=MwSt-Massenänderung
ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Services von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank! ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
MassBarcodeInit=Mass barcode init MassBarcodeInit=Mass barcode init
MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind! MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto
ProductAccountancySellCode=Buchhaltung - Erlöskonto ProductAccountancySellCode=Buchhaltung - Erlöskonto
ProductOrService=Produkt oder Service ProductOrService=Produkt oder Dienstleistung
ProductsAndServices=Produkte und Services ProductsAndServices=Produkte und Dienstleistungen
ProductsOrServices=Produkte oder Services ProductsOrServices=Produkte oder Dienstleistungen
ProductsAndServicesOnSell=Verfügbare Produkte und Services ProductsAndServicesOnSell=Verfügbare Produkte und Dienstleistungen
ProductsAndServicesNotOnSell=Aufgelassene Produkte und Services ProductsAndServicesNotOnSell=Aufgelassene Produkte und Dienstleistungen
ProductsAndServicesStatistics=Produkt- und Service-Statistik ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik
ProductsStatistics=Produktstatistik ProductsStatistics=Produktstatistik
ProductsOnSell=Verfügbare Produkte ProductsOnSell=Verfügbare Produkte
ProductsNotOnSell=Aufgelassene Produkte ProductsNotOnSell=Aufgelassene Produkte
ProductsOnSellAndOnBuy=Produkte weder für Ein- noch Verkauf ProductsOnSellAndOnBuy=Produkte weder für Ein- noch Verkauf
ServicesOnSell=Verfügbare Services ServicesOnSell=Verfügbare Dienstleistungen
ServicesNotOnSell=Aufgelassene Services ServicesNotOnSell=Aufgelassene Dienstleistungen
ServicesOnSellAndOnBuy=Services weder für Ein- noch Verkauf ServicesOnSellAndOnBuy=Dienstleistungen weder für Ein- noch Verkauf
InternalRef=Interne Referenz InternalRef=Interne Referenz
LastRecorded=Zuletzt erfasste, verfügbare Produkte/Services LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen
LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Services LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Dienstleistungen
LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Services LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Dienstleistungen
LastRecordedProducts=%s zuletzt erfasste Produkte LastRecordedProducts=%s zuletzt erfasste Produkte
LastRecordedServices=%s zuletzt erfasste Services LastRecordedServices=%s zuletzt erfasste Dienstleistungen
LastProducts=Neueste Produkte LastProducts=Neueste Produkte
CardProduct0=Produkt-Karte CardProduct0=Produkt-Karte
CardProduct1=Service-Karte CardProduct1=Dienstleistungs-Karte
CardContract=Auftrags-Karte CardContract=Auftrags-Karte
Warehouse=Warenlager Warehouse=Warenlager
Warehouses=Warenlager Warehouses=Warenlager
@ -74,25 +74,25 @@ NewPrice=Neuer Preis
MinPrice=Mindestverkaufspreis MinPrice=Mindestverkaufspreis
MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.) MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.)
MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.) MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt, wenn Sie einen zu hohen Rabatt geben. CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
ContractStatus=Vertragsstatus ContractStatus=Vertragsstatus
ContractStatusClosed=Geschlossen ContractStatusClosed=Geschlossen
ContractStatusRunning=In Arbeit ContractStatusRunning=In Arbeit
ContractStatusExpired=Abgelaufen ContractStatusExpired=Abgelaufen
ContractStatusOnHold=Nicht in Arbeit ContractStatusOnHold=Nicht in Arbeit
ContractStatusToRun=To get running ContractStatusToRun=zu bearbeiten
ContractNotRunning=Dieser Vertrag wird nicht bearbeitet ContractNotRunning=Dieser Vertrag wird nicht bearbeitet
ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits. ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben. ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben.
ErrorProductClone=Beim Duplizieren des Produkts oder Service ist ein Problem aufgetreten ErrorProductClone=Beim Duplizieren des Produkts oder der Dienstleistung ist ein Problem aufgetreten
ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen.
Suppliers=Lieferanten Suppliers=Lieferanten
SupplierRef=Lieferanten-Artikelnummer SupplierRef=Lieferanten-Artikelnummer
ShowProduct=Produkt anzeigen ShowProduct=Produkt anzeigen
ShowService=Zeige Service ShowService=Dienstleistung anzeigen
ProductsAndServicesArea=Produkt-und Services-Übersicht ProductsAndServicesArea=Produkt-und Dienstleistungs-Übersicht
ProductsArea=Produktübersicht ProductsArea=Produktübersicht
ServicesArea=Services-Übersicht ServicesArea=Dienstleistungs-Übersicht
AddToMyProposals=Zu meinen Angebote hinzufügen AddToMyProposals=Zu meinen Angebote hinzufügen
AddToOtherProposals=Zu Angeboten Anderer hinzufügen AddToOtherProposals=Zu Angeboten Anderer hinzufügen
AddToMyBills=Zu meinen Rechnungen hinzufügen AddToMyBills=Zu meinen Rechnungen hinzufügen
@ -113,9 +113,9 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
BarcodeValue=Barcode-Wert BarcodeValue=Barcode-Wert
NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...) NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
CreateCopy=Kopie erstellen CreateCopy=Kopie erstellen
ServiceLimitedDuration=Ist die Leistungserbringung eines Service zeitlich beschränkt: ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschränkt:
MultiPricesAbility=Mehrere Preisstufen pro Produkt/Service MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
MultiPricesNumPrices=Preisnummer MultiPricesNumPrices=Anzahl Preise
MultiPriceLevelsName=Preiskategorien MultiPriceLevelsName=Preiskategorien
AssociatedProductsAbility=Untergeordnete Produkte aktivieren AssociatedProductsAbility=Untergeordnete Produkte aktivieren
AssociatedProducts=Unterprodukte AssociatedProducts=Unterprodukte
@ -159,14 +159,14 @@ DiscountQtyMin=Standard-Rabatt für die Menge
NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert
NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert
RecordedProducts=Erfasste Produkte RecordedProducts=Erfasste Produkte
RecordedServices=Erfasste Services RecordedServices=Erfasste Dienstleistungen
RecordedProductsAndServices=Erfasste Produkte/Leistungen RecordedProductsAndServices=Erfasste Produkte/Leistungen
PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte
PredefinedServicesToSell=Vordefinierte Services zum Verkauf PredefinedServicesToSell=Vordefinierte Dienstleistungen zum Verkauf
PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Services PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Dienstleistungen
PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
PredefinedServicesToPurchase=Vordefinierte Services zum Einkauf PredefinedServicesToPurchase=Vordefinierte Dienstleistungen zum Einkauf
PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Services PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Dienstleistungen
GenerateThumb=Erzeuge Vorschaubild GenerateThumb=Erzeuge Vorschaubild
ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons
ServiceNb=Leistung #%s ServiceNb=Leistung #%s
@ -176,31 +176,31 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
Finished=Eigenproduktion Finished=Eigenproduktion
RowMaterial=Rohmaterial RowMaterial=Rohmaterial
CloneProduct=Produkt/Leistung duplizieren CloneProduct=Produkt/Leistung duplizieren
ConfirmCloneProduct=Möchten Sie <b>%s</b> wirklich duplizieren? ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
ClonePricesProduct=Allgemeine Informationen und Preise duplizieren ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
CloneCompositionProduct=Unterprodukt/-Service duplizieren CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren
ProductIsUsed=Produkt in Verwendung ProductIsUsed=Produkt in Verwendung
NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
CustomerPrices=Kundenpreise CustomerPrices=Kundenpreise
SuppliersPrices=Lieferantenpreise SuppliersPrices=Lieferantenpreise
SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Services) SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Dienstleistungen)
CustomCode=Interner Code CustomCode=Interner Code
CountryOrigin=Urspungsland CountryOrigin=Urspungsland
HiddenIntoCombo=In ausgewählten Listen nicht anzeigen HiddenIntoCombo=In ausgewählten Listen nicht anzeigen
Nature=Art Nature=Art
ProductCodeModel=Vorlage für Produktreferenz ProductCodeModel=Vorlage für Produktreferenz
ServiceCodeModel=Vorlage für Service-Referenz ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
AddThisProductCard=Produktkarte erstellen AddThisProductCard=Produktkarte erstellen
HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert. HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert.
AddThisServiceCard=Service-Karte erstellen AddThisServiceCard=Dienstleistungs-Karte erstellen
HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, einen Service zu erstellen oder zu duplizieren wenn er noch nicht existiert. HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, eine Dienstleistung zu erstellen oder zu duplizieren wenn sie noch nicht existiert.
CurrentProductPrice=Aktueller Preis CurrentProductPrice=Aktueller Preis
AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Service nutzen AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Dienstleistung nutzen
AlwaysUseFixedPrice=Festen Preis nutzen AlwaysUseFixedPrice=Festen Preis nutzen
PriceByQuantity=Preis nach Menge PriceByQuantity=Preis nach Menge
PriceByQuantityRange=Bereich der Menge PriceByQuantityRange=Bereich der Menge
ProductsDashboard=Produkt-und Services-Zusammenfassung ProductsDashboard=Produkt- und Dienstleistungs-Zusammenfassung
UpdateOriginalProductLabel=Ursprüngliches Label verändern UpdateOriginalProductLabel=Ursprüngliches Label verändern
HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten
### composition fabrication ### composition fabrication
@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
ProductUsedForBuild=Automatisch für Produktion verbraucht ProductUsedForBuild=Automatisch für Produktion verbraucht
ProductBuilded=Produktion fertiggestellt ProductBuilded=Produktion fertiggestellt
ProductsMultiPrice=Produkt Multi-Preis ProductsMultiPrice=Produkt Multi-Preis
ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Services, Multi-Preise) ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Dienstleistungen, Multi-Preise)
ProductSellByQuarterHT=Products turnover quarterly VWAP ProductSellByQuarterHT=Products turnover quarterly VWAP
ServiceSellByQuarterHT=Services turnover quarterly VWAP ServiceSellByQuarterHT=Services turnover quarterly VWAP
Quarter1=1. Quartal Quarter1=1. Quartal
@ -234,11 +234,11 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner
BarCodeDataForProduct=Barcode-Information von Produkt %s: BarCodeDataForProduct=Barcode-Information von Produkt %s:
BarCodeDataForThirdparty=Barcode-Information von Partner %s: BarCodeDataForThirdparty=Barcode-Information von Partner %s:
ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
PriceByCustomer=Price by customer PriceByCustomer=Preis des Kunden
PriceCatalogue=Unique price per product/service PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
PricingRule=Preisregeln PricingRule=Preisregeln
AddCustomerPrice=Add price by customers AddCustomerPrice=Add price by customers
ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
PriceByCustomerLog=Price by customer log PriceByCustomerLog=Price by customer log
MinimumPriceLimit=Minimum price can't be lower that %s MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein
MinimumRecommendedPrice=Minimum recommended price is : %s MinimumRecommendedPrice=Minimaler empfohlener Preis: %s

4
htdocs/langs/de_DE/projects.lang
View File

@ -124,7 +124,7 @@ AddElement=Mit Element verknüpfen
DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.)
PlannedWorkload = Geplante Auslastung PlannedWorkload = Geplante Auslastung
WorkloadOccupation= Beeinflussung der Auslastung WorkloadOccupation= Beeinflussung der Auslastung
ProjectReferers=Refering objects ProjectReferers=Bezugnahmen
SearchAProject=Search a project SearchAProject=Suchen Sie ein Projekt
ProjectMustBeValidatedFirst=Project must be validated first ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects ProjectDraft=Draft projects

4
htdocs/langs/de_DE/propal.lang
View File

@ -98,5 +98,5 @@ TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot
DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.) DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.)
DocModelJauneDescription=Angebotsvorlage <Jaune> DocModelJauneDescription=Angebotsvorlage <Jaune>
DefaultModelPropalCreate=Erstellung Standardvorlage DefaultModelPropalCreate=Erstellung Standardvorlage
# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)

4
htdocs/langs/de_DE/salaries.lang
View File

@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users # Dolibarr language file - Source file is en_US - users
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungscode für Bezahlung der Gehälter
SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Lohn Salary=Lohn
Salaries=Löhne Salaries=Löhne
Employee=Angestellter Employee=Angestellter
@ -6,3 +8,5 @@ NewSalaryPayment=Neue Lohnzahlung
SalaryPayment=Lohnzahlung SalaryPayment=Lohnzahlung
SalariesPayments=Lohnzahlungen SalariesPayments=Lohnzahlungen
ShowSalaryPayment=Zeige Lohnzahlung ShowSalaryPayment=Zeige Lohnzahlung
THM=Durchschnittlicher Stundenpreis
TJM=Durchschnittlicher Tagespreis

6
htdocs/langs/de_DE/stocks.lang
View File

@ -88,7 +88,7 @@ PersonalStock=Persönlicher Warenbestand %s
ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s
SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
NoStockAction=No stock action NoStockAction=Keine Vorratsänderung
LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang
DesiredStock=gewünschter Lagerbestand DesiredStock=gewünschter Lagerbestand
StockToBuy=zu bestellen StockToBuy=zu bestellen
@ -109,10 +109,10 @@ WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet
ForThisWarehouse=Für dieses Lager ForThisWarehouse=Für dieses Lager
ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen. ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen.
ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen
Replenishments=Replenishments Replenishments=Nachschub
NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s) NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s) NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
MassMovement=Mass movement MassMovement=Massenbewegung
MassStockMovement=Massen-Umlagerung MassStockMovement=Massen-Umlagerung
SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s". SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s".
RecordMovement=Record transfert RecordMovement=Record transfert

3
htdocs/langs/de_DE/users.lang
View File

@ -114,8 +114,9 @@ YourRole=Ihre Rolle
YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
NbOfUsers=Anzahl der Benutzer NbOfUsers=Anzahl der Benutzer
DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden
HierarchicalResponsible=In der Hierarchie verantwortlich HierarchicalResponsible=Aufseher
HierarchicView=Hierarchische Ansicht HierarchicView=Hierarchische Ansicht
UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
OpenIDURL=OpenID URL OpenIDURL=OpenID URL
LoginUsingOpenID=Verwende OpenID für Anmeldung LoginUsingOpenID=Verwende OpenID für Anmeldung
WeeklyHours=Wochenstunden

2
htdocs/langs/de_DE/withdrawals.lang
View File

@ -56,7 +56,7 @@ StatusCredited=Eingelöst
StatusRefused=Abgelehnt StatusRefused=Abgelehnt
StatusMotif0=Nicht spezifiziert StatusMotif0=Nicht spezifiziert
StatusMotif1=Unzureichende Deckung StatusMotif1=Unzureichende Deckung
StatusMotif2=Request contested StatusMotif2=Anfrage bestritten
StatusMotif3=Kein Abbuchungsauftrag StatusMotif3=Kein Abbuchungsauftrag
StatusMotif4=Kundenanfrage StatusMotif4=Kundenanfrage
StatusMotif5=nicht nutzbare Kontodaten StatusMotif5=nicht nutzbare Kontodaten

4
htdocs/langs/en_US/companies.lang
View File

@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
ListSuppliersShort=List of suppliers ListSuppliersShort=List of suppliers
ListProspectsShort=List of prospects ListProspectsShort=List of prospects
ListCustomersShort=List of customers ListCustomersShort=List of customers
ThirdPartiesArea=Third parties area ThirdPartiesArea=Third parties and contact area
LastModifiedThirdParties=Last %s modified third parties LastModifiedThirdParties=Last %s modified third parties
UniqueThirdParties=Total of unique third parties UniqueThirdParties=Total of unique third parties
InActivity=Open InActivity=Open
@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
LeopardNumRefModelDesc=The code is free. This code can be modified at any time. LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
ManagingDirectors=Manager(s) name (CEO, director, president...) ManagingDirectors=Manager(s) name (CEO, director, president...)
SearchThirdparty=Search thirdparty
SearchContact=Search contact

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

@ -85,13 +85,13 @@ ActionsOnProject=Events on project
YouAreNotContactOfProject=You are not a contact of this private project YouAreNotContactOfProject=You are not a contact of this private project
DeleteATimeSpent=Delete time spent DeleteATimeSpent=Delete time spent
ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
DoNotShowMyTasksOnly=See also tasks not allocated to me DoNotShowMyTasksOnly=See also tasks not assigned to me
ShowMyTasksOnly=View only tasks allocated to me ShowMyTasksOnly=View only tasks assigned to me
TaskRessourceLinks=Ressources TaskRessourceLinks=Ressources
ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
NoTasks=No tasks for this project NoTasks=No tasks for this project
LinkedToAnotherCompany=Linked to other third party LinkedToAnotherCompany=Linked to other third party
TaskIsNotAffectedToYou=Task not allocated to you TaskIsNotAffectedToYou=Task not assigned to you
ErrorTimeSpentIsEmpty=Time spent is empty ErrorTimeSpentIsEmpty=Time spent is empty
ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent. ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.

4
htdocs/langs/en_US/sendings.lang
View File

@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
SumOfProductVolumes=Sum of product volumes SumOfProductVolumes=Sum of product volumes
SumOfProductWeights=Sum of product weights SumOfProductWeights=Sum of product weights
# warehouse details
DetailWarehouseNumber= Warehouse details
DetailWarehouseFormat= W:%s (Qty : %d)

2
htdocs/langs/en_US/suppliers.lang
View File

@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b> ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
SentToSuppliers=Sent to suppliers SentToSuppliers=Sent to suppliers
ListOfSupplierOrders=List of supplier orders
MenuOrdersSupplierToBill=Supplier orders to invoice

174
htdocs/langs/fr_FR/accountancy.lang
View File

@ -1,33 +1,33 @@
# Dolibarr language file - fr_FR - Accountancy # Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8 CHARSET=UTF-8
Accounting=Comptabilité Accounting=Comptabilité
Globalparameters=Paramètres globaux Globalparameters=Paramètres globals
Chartofaccounts=Plan comptable Chartofaccounts=Plan comptable
Fiscalyear=Exercices fiscaux Fiscalyear=Années fiscales
Menuaccount=Comptes comptables Menuaccount=Comptes comptables
Menuthirdpartyaccount=Comptes tiers Menuthirdpartyaccount=Comptes de tiers
MenuTools=Outils MenuTools=Outils
ConfigAccountingExpert=Configuration du module comptabilité expert ConfigAccountingExpert=Configuration du module comptabilité expert
Journaux=Journaux Journaux=Journaux
JournalFinancial=Journaux de trésorerie JournalFinancial=Journaux financiers
Exports=Exports Exports=Exports
Modelcsv=Modèle d'export Modelcsv=Modèle d'export
Selectmodelcsv=Sélectionnez un modèle d'export Selectmodelcsv=Sélectionner un modèle d'export
Modelcsv_normal=Export classique Modelcsv_normal=Export standard
Modelcsv_CEGID=Export vers CEGID Expert Modelcsv_CEGID=Export vers CEGID Expert
BackToChartofaccounts=Retour plan comptable BackToChartofaccounts=Return chart of accounts
Back=Retour Back=Return
Definechartofaccounts=Définir un plan comptable Definechartofaccounts=Définir un plan comptable
Selectchartofaccounts=Sélectionnez un plan comptable Selectchartofaccounts=Sélectionner un plan comptable
Validate=Valider Validate=Valider
Addanaccount=Ajouter un compte comptable Addanaccount=Ajouter un compte comptable
AccountAccounting=Compte comptable AccountAccounting=Compte comptable
Ventilation=Ventilation Ventilation=Ventilation
ToDispatch=A effectuer ToDispatch=A ventiler
Dispatched=Effectuée Dispatched=Ventilés
CustomersVentilation=Ventilation clients CustomersVentilation=Ventilation clients
SuppliersVentilation=Ventilation fournisseurs SuppliersVentilation=Ventilation fournisseurs
@ -36,123 +36,123 @@ Reports=Rapports
ByCustomerInvoice=Par factures clients ByCustomerInvoice=Par factures clients
ByMonth=Par mois ByMonth=Par mois
NewAccount=Nouveau compte comptable NewAccount=Nouveau compte comptable
Update=Mettre à jour Update=Modifier
List=Liste List=Liste
Create=Créer Create=Créer
UpdateAccount=Modification d'un compte UpdateAccount=Modification de compte comptable
UpdateMvts=Modification d'un mouvement UpdateMvts=Modification de mouvements
WriteBookKeeping=Comptabiliser les écritures dans le grand livre WriteBookKeeping=Record accounts in general ledger
Bookkeeping=Grand livre Bookkeeping=General ledger
AccountBalanceByMonth=Balance mensuelle AccountBalanceByMonth=Solde par mois
AccountingVentilation=Ventilation comptable AccountingVentilation=Ventilation comptable
AccountingVentilationSupplier=Ventilation comptable fournisseur AccountingVentilationSupplier=Ventilation comptable client
AccountingVentilationCustomer=Ventilation comptable client AccountingVentilationCustomer=Ventilation comptable fournisseur
Line=Ligne Line=Ligne
CAHTF=Total achat fournisseur HT CAHTF=Total achats fournisseur HT
InvoiceLines=Lignes de facture à ventiler InvoiceLines=Lignes de factures à ventiler
InvoiceLinesDone=Lignes de facture ventilées InvoiceLinesDone=Lignes de factures ventilées
IntoAccount=Dans le compte comptable IntoAccount=In the accounting account
Ventilate=Ventiler Ventilate=Ventilate
VentilationAuto=Ventilation automatique VentilationAuto=Automatic ventilation
Processing=Traitement en cours Processing=Processing
EndProcessing=Fin de traitement EndProcessing=The end of processing
AnyLineVentilate=Aucune ligne à ventiler AnyLineVentilate=Any lines to ventilate
SelectedLines=Lignes sélectionnées SelectedLines=Lignes sélectionnées
Lineofinvoice=Ligne de facture Lineofinvoice=Line of invoice
VentilatedinAccount=Ventilée avec succès dans le compte comptable VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Non ventilée dans le compte comptable NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Séparateur CSV ACCOUNTINGEX_SEPARATORCSV=Séparateur de champ
ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50) ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
AccountLength=Longueur des comptes comptables affichés dans Dolibarr AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels. AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
ACCOUNTING_SELL_JOURNAL=Journal des Ventes ACCOUNTINGEX_SELL_JOURNAL=Journal des ventes
ACCOUNTING_PURCHASE_JOURNAL=Journal des Achats ACCOUNTINGEX_PURCHASE_JOURNAL=Journal des achats
ACCOUNTING_BANK_JOURNAL=Journal de Banque ACCOUNTINGEX_BANK_JOURNAL=Journal de banque
ACCOUNTING_CASH_JOURNAL=Journal de Caisse ACCOUNTINGEX_CASH_JOURNAL=Journal de compte caisse
ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des Opérations Diverses ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Journal divers
ACCOUNTING_SOCIAL_JOURNAL=Journal Social ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Compte de transfert
ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente ACCOUNTINGEX_ACCOUNT_SUSPENSE=Compte d'attente
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
Doctype=Type de document Doctype=Type de documents
Docdate=Date Docdate=Date
Docref=Référence Docref=Reference
Numerocompte=Compte Numerocompte=Compte
Code_tiers=Tiers Code_tiers=Tiers
Labelcompte=Libellé compte Labelcompte=Label account
Debit=Débit Debit=Débit
Credit=Crédit Credit=Crédit
Amount=Montant Amount=Montant
Sens=Sens Sens=Sens
Codejournal=Journal Codejournal=Journal
DelBookKeeping=Supprimer les écritures du grand livre DelBookKeeping=Delete the records of the general ledger
SellsJournal=Journal des ventes SellsJournal=Journal des ventes
PurchasesJournal=Journal des achats PurchasesJournal=Journal des achats
DescSellsJournal=Journal des ventes DescSellsJournal=Journal des ventes
DescPurchasesJournal=Journal des achats DescPurchasesJournal=Journal des achats
BankJournal=Journal de banque BankJournal=Bank journal
DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce DescBankJournal=Bank journal including all the types of payments other than cash
CashJournal=Journal de caisse CashJournal=Cash journal
DescCashJournal=Journal de caisse comprenant le type de règlement "espèce" DescCashJournal=Cash journal including the type of payment cash
CashPayment=Règlement espèce CashPayment=Cash Payment
SupplierInvoicePayment=Règlement de facture fournisseur SupplierInvoicePayment=Payment of invoice supplier
CustomerInvoicePayment=Règlement de facture client CustomerInvoicePayment=Payment of invoice customer
ThirdPartyAccount=Compte tiers ThirdPartyAccount=Thirdparty account
NewAccountingMvt=Nouveau mouvement NewAccountingMvt=New movement
NumMvts=Numéro de mouvement NumMvts=Number of movement
ListeMvts=Liste du mouvement ListeMvts=Liste des mouvements
ErrorDebitCredit=Debit et Credit ne peuvent avoir une valeur en même temps ErrorDebitCredit=Debit and Credit cannot have a value at the same time
ReportThirdParty=Liste compte tiers ReportThirdParty=List thirdparty account
DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
ListAccounts=Liste des comptes comptables ListAccounts=List of the accounting accounts
Pcgversion=Version du plan Pcgversion=Version du plan
Pcgtype=Classe de compte Pcgtype=Classe de compte
Pcgsubtype=Sous classe de compte Pcgsubtype=Under class of account
Accountparent=Racine du compte Accountparent=Racine des comptes
Active=État Active=Relevé
NewFiscalYear=Nouvel exercice fiscal NewFiscalYear=Nouvelle année fiscale
DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
TotalVente=Total chiffre affaires HT TotalVente=Total turnover HT
TotalMarge=Total marge commerciale TotalMarge=Total sales margin
DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilez vos lignes de facture client avec un compte comptable DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte : ChangeAccount=Change the accounting account for lines selected by the account:
Vide=- Vide=-
DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
DescVentilTodoSupplier=Ventilez vos lignes de facture fournisseur avec un compte comptable DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
ValidateHistory=Valider Automatiquement ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ce compte comptable car il est utilisé ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
FicheVentilation=Fiche ventilation FicheVentilation=Ventilation card

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

@ -45,8 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou s
ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s</b> ne sont pas prises en charge. ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s</b> ne sont pas prises en charge.
DictionarySetup=Dictionnaires DictionarySetup=Dictionnaires
Dictionary=Dictionnaires Dictionary=Dictionnaires
Chartofaccounts=Chart of accounts Chartofaccounts=Plan comptable
Fiscalyear=Fiscal years Fiscalyear=Année fiscale
ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0 ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text). DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
@ -586,6 +586,9 @@ Permission92=Créer/modifier les charges et la TVA
Permission93=Supprimer les charges et la TVA Permission93=Supprimer les charges et la TVA
Permission94=Exporter les charges Permission94=Exporter les charges
Permission95=Consulter CA, bilans et résultats Permission95=Consulter CA, bilans et résultats
Permission96=Paramétrer la ventilation
Permission97=Lire les lignes de factures
Permission98=Ventiler les lignes de factures
Permission101=Consulter les expéditions Permission101=Consulter les expéditions
Permission102=Créer/modifier les expéditions Permission102=Créer/modifier les expéditions
Permission104=Valider les expéditions Permission104=Valider les expéditions

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

@ -55,7 +55,7 @@ DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
MenuOrdersToBill=Commandes délivrées MenuOrdersToBill=Commandes délivrées
MenuOrdersToBill2=Commandes à facturer MenuOrdersToBill2=Commandes à facturer
SearchOrder=Rechercher une commande SearchOrder=Rechercher une commande
SearchACustomerOrder=Rechercher code client SearchACustomerOrder=Rechercher une commande client
ShipProduct=Expédier produit ShipProduct=Expédier produit
Discount=Remise Discount=Remise
CreateOrder=Créer Commande CreateOrder=Créer Commande
@ -101,7 +101,6 @@ RelatedOrders=Commandes rattachées
OnProcessOrders=Commandes en cours de traitement OnProcessOrders=Commandes en cours de traitement
RefOrder=Réf. commande RefOrder=Réf. commande
RefCustomerOrder=Réf. commande client RefCustomerOrder=Réf. commande client
CustomerOrder=Commande client
RefCustomerOrderShort=Réf. com. client RefCustomerOrderShort=Réf. com. client
SendOrderByMail=Envoyer commande par mail SendOrderByMail=Envoyer commande par mail
ActionsOnOrder=Événements sur la commande ActionsOnOrder=Événements sur la commande
@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non définie
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s' Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s'
Error_OrderNotChecked=Pas de commandes à facturer sélectionnées Error_OrderNotChecked=Pas de commandes à facturer sélectionnées
# Sources # Sources
OrderSource0=Proposition commerciale OrderSource0=Proposition commerciale
OrderSource1=Internet OrderSource1=Internet
@ -144,7 +141,6 @@ OrderSource5=Commercial
OrderSource6=Magasin OrderSource6=Magasin
QtyOrdered=Qté commandée QtyOrdered=Qté commandée
AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande
# Documents models # Documents models
PDFEinsteinDescription=Modèle de commande complet (logo…) PDFEinsteinDescription=Modèle de commande complet (logo…)
PDFEdisonDescription=Modèle de commande simple PDFEdisonDescription=Modèle de commande simple
@ -155,7 +151,6 @@ OrderByFax=Fax
OrderByEMail=Email OrderByEMail=Email
OrderByWWW=En ligne OrderByWWW=En ligne
OrderByPhone=Téléphone OrderByPhone=Téléphone
CreateInvoiceForThisCustomer=Facturer commandes CreateInvoiceForThisCustomer=Facturer commandes
NoOrdersToInvoice=Pas de commandes facturables NoOrdersToInvoice=Pas de commandes facturables
CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées. CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées.

2
htdocs/langs/fr_FR/suppliers.lang
View File

@ -40,3 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur
ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b> ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment
SentToSuppliers=Envoyés aux fournisseurs SentToSuppliers=Envoyés aux fournisseurs
ListOfSupplierOrders=Liste des commandes fournisseur
MenuOrdersSupplierToBill=Commandes fournisseur à facturer

12
htdocs/langs/hr_HR/bills.lang
View File

@ -85,7 +85,7 @@ ClassifyPaid=Označi kao plaćeno
ClassifyPaidPartially=Označi kao djelomično plaćeno ClassifyPaidPartially=Označi kao djelomično plaćeno
ClassifyCanceled=Označi kao napušteno ClassifyCanceled=Označi kao napušteno
ClassifyClosed=Označi kao zatvoreno ClassifyClosed=Označi kao zatvoreno
ClassifyUnBilled=Classify 'Unbilled' ClassifyUnBilled=Klasificirati 'nefakturirano'
CreateBill=Izradi račun CreateBill=Izradi račun
AddBill=Dodaj račun ili bonifikaciju AddBill=Dodaj račun ili bonifikaciju
AddToDraftInvoices=Dodati u skice računa AddToDraftInvoices=Dodati u skice računa
@ -163,7 +163,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug. ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
@ -198,8 +198,8 @@ Rest=U toku
AmountExpected=Utvrđen iznos AmountExpected=Utvrđen iznos
ExcessReceived=Previše primljeno ExcessReceived=Previše primljeno
EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća) EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
SendBillRef=Submission of invoice %s SendBillRef=Podnošenje računa %s
SendReminderBillRef=Submission of invoice %s (reminder) SendReminderBillRef=Podnošenje Računa %s (podsjetnik)
StandingOrders=Otvorene narudžbe StandingOrders=Otvorene narudžbe
StandingOrder=Otvorene narudžbe StandingOrder=Otvorene narudžbe
NoDraftBills=Nema skica računa NoDraftBills=Nema skica računa
@ -232,7 +232,7 @@ Repeatables=Predložak
ChangeIntoRepeatableInvoice=Pretvori u predložak ChangeIntoRepeatableInvoice=Pretvori u predložak
CreateRepeatableInvoice=Izradi predložak računa CreateRepeatableInvoice=Izradi predložak računa
CreateFromRepeatableInvoice=Izradi iz predloška računa CreateFromRepeatableInvoice=Izradi iz predloška računa
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa
CustomersInvoicesAndPayments=Računi i plaćanja kupca CustomersInvoicesAndPayments=Računi i plaćanja kupca
ExportDataset_invoice_1=Računi kupca i popis računa ExportDataset_invoice_1=Računi kupca i popis računa
ExportDataset_invoice_2=Računi i plaćanja kupca ExportDataset_invoice_2=Računi i plaćanja kupca
@ -369,7 +369,7 @@ LawApplicationPart4=njihove cijene.
LimitedLiabilityCompanyCapital=SARL with Capital of LimitedLiabilityCompanyCapital=SARL with Capital of
UseLine=Primjeni UseLine=Primjeni
UseDiscount=Iskoriti popust UseDiscount=Iskoriti popust
UseCredit=Use credit UseCredit=Koristite kredit
UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
MenuChequeDeposits=Checks deposits MenuChequeDeposits=Checks deposits
MenuCheques=Čekovi MenuCheques=Čekovi

180
htdocs/langs/hr_HR/boxes.lang
View File

@ -1,91 +1,91 @@
# Dolibarr language file - Source file is en_US - boxes # Dolibarr language file - Source file is en_US - boxes
# BoxLastRssInfos=Rss information BoxLastRssInfos=RSS Informacije
# BoxLastProducts=Last %s products/services BoxLastProducts=Zadnjih %s proizvoda / usluga
# BoxProductsAlertStock=Products in stock alert BoxProductsAlertStock=Proizvodi u skaldištu - uzbuna
# BoxLastProductsInContract=Last %s contracted products/services BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda / usluga
# BoxLastSupplierBills=Last supplier's invoices BoxLastSupplierBills=Posljednji računi od dobavljača
# BoxLastCustomerBills=Last customer's invoices BoxLastCustomerBills=Posljednji računi od kupaca
# BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices BoxOldestUnpaidCustomerBills=Najstariji neplaćeni računi kupaca
# BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices BoxOldestUnpaidSupplierBills=Najstariji neplaćeni računi dobavljača
# BoxLastProposals=Last commercial proposals BoxLastProposals=Najnovije ponude
# BoxLastProspects=Last modified prospects BoxLastProspects=Posljednji izmijenjeni potencijalni kupci
# BoxLastCustomers=Last modified customers BoxLastCustomers=Posljednji izmijenjeni kupci
# BoxLastSuppliers=Last modified suppliers BoxLastSuppliers=Posljednji izmijenjeni dobavljači
# BoxLastCustomerOrders=Last customer orders BoxLastCustomerOrders=Najnovije narudžbe kupaca
# BoxLastBooks=Last books BoxLastBooks=Najnovije knjige
# BoxLastActions=Last actions BoxLastActions=Najnovije aktivnosti
# BoxLastContracts=Last contracts BoxLastContracts=Najnoviji ugovori
# BoxLastContacts=Last contacts/addresses BoxLastContacts=Najnoviji kontakti / Adrese
# BoxLastMembers=Last members BoxLastMembers=Najnoviji članovi
# BoxFicheInter=Last interventions BoxFicheInter=Najnovije intervencije
# BoxCurrentAccounts=Opened accounts balance BoxCurrentAccounts=Stanje otvorenih računa
# BoxSalesTurnover=Sales turnover BoxSalesTurnover=Promet
# BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices BoxTotalUnpaidCustomerBills=Ukupni neplaćeni računi kupaca
# BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices BoxTotalUnpaidSuppliersBills=Ukupni neplaćeni računi dobavljača
# BoxTitleLastBooks=Last %s recorded books BoxTitleLastBooks=Posljednjih %s spremljenih knjige
# BoxTitleNbOfCustomers=Number of clients BoxTitleNbOfCustomers=Broj klijenata
# BoxTitleLastRssInfos=Last %s news from %s BoxTitleLastRssInfos=Posljednjih %s vijesti iz %s
# BoxTitleLastProducts=Last %s modified products/services BoxTitleLastProducts=Posljednjih %s izmijenjenih proizvoda / usluga
# BoxTitleProductsAlertStock=Products in stock alert BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna
# BoxTitleLastCustomerOrders=Last %s modified customer orders BoxTitleLastCustomerOrders=Posljdnjih %s izmijenjenih narudžba kupaca
# BoxTitleLastSuppliers=Last %s recorded suppliers BoxTitleLastSuppliers=Prošlogodišnjih %s spremljenih dobavljača
# BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastCustomers=Posljednjih %s spremljenih kupaca
# BoxTitleLastModifiedSuppliers=Last %s modified suppliers BoxTitleLastModifiedSuppliers=Posljednjih %s izmijenjenih dobavljača
# BoxTitleLastModifiedCustomers=Last %s modified customers BoxTitleLastModifiedCustomers=Posljednjih %s izmijenjenih kupaca
# BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects BoxTitleLastCustomersOrProspects=Posljednjih %s izmijenjenih kupaca ili potencijalnih kupaca
# BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastPropals=Posljednjih %s spremljenih ponuda
# BoxTitleLastCustomerBills=Last %s customer's invoices BoxTitleLastCustomerBills=Posljednjih %s računi kupaca
# BoxTitleLastSupplierBills=Last %s supplier's invoices BoxTitleLastSupplierBills=Posljednjih %s računi dobavljača
# BoxTitleLastProspects=Last %s recorded prospects BoxTitleLastProspects=Posljednjih %s spremljenih potencijalnih kupaca
# BoxTitleLastModifiedProspects=Last %s modified prospects BoxTitleLastModifiedProspects=Posljednjih %s izmijenjenih potencijalnih kupaca
# BoxTitleLastProductsInContract=Last %s products/services in a contract BoxTitleLastProductsInContract=Posljednjih %s proizvoda / usluga u ugovorima
# BoxTitleLastModifiedMembers=Last %s modified members BoxTitleLastModifiedMembers=Prošlogodišnji% s modificirani članovi
# BoxTitleLastFicheInter=Last %s modified intervention BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija
# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices BoxTitleOldestUnpaidCustomerBills=Najstariji% s neplaćene račune kupca
# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices BoxTitleOldestUnpaidSupplierBills=Najstariji% s neplaćene račune dobavljača
# BoxTitleCurrentAccounts=Opened account's balances BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa
# BoxTitleSalesTurnover=Sales turnover BoxTitleSalesTurnover=Promet
# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices BoxTitleTotalUnpaidCustomerBills=Neplaćeni računi kupca
# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices BoxTitleTotalUnpaidSuppliersBills=Neplaćeni računi dobavljača
# BoxTitleLastModifiedContacts=Last %s modified contacts/addresses BoxTitleLastModifiedContacts=Prošlogodišnji% s modificirani kontakti / Adrese
# BoxMyLastBookmarks=My last %s bookmarks BoxMyLastBookmarks=Moja posljednja% s oznake
# BoxOldestExpiredServices=Oldest active expired services BoxOldestExpiredServices=Najstariji aktivni istekli usluge
# BoxLastExpiredServices=Last %s oldest contacts with active expired services BoxLastExpiredServices=Prošlogodišnji% s Najstariji kontakti s aktivnim istekao usluge
# BoxTitleLastActionsToDo=Last %s actions to do BoxTitleLastActionsToDo=Prošlogodišnji% s akcije učiniti
# BoxTitleLastContracts=Last %s contracts BoxTitleLastContracts=Prošlogodišnji% s ugovorima
# BoxTitleLastModifiedDonations=Last %s modified donations BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije
# BoxTitleLastModifiedExpenses=Last %s modified expenses BoxTitleLastModifiedExpenses=Prošlogodišnji% s modificirani rashodi
# BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
# FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s
# LastRefreshDate=Last refresh date LastRefreshDate=Posljednji dan osvježavanja
# NoRecordedBookmarks=No bookmarks defined. NoRecordedBookmarks=Nema oznaka definirana.
# ClickToAdd=Click here to add. ClickToAdd=Kliknite ovdje za dodavanje.
# NoRecordedCustomers=No recorded customers NoRecordedCustomers=Nema snimljene kupci
# NoRecordedContacts=No recorded contacts NoRecordedContacts=Nema snimljene kontakti
# NoActionsToDo=No actions to do NoActionsToDo=Nema akcije učiniti
# NoRecordedOrders=No recorded customer's orders NoRecordedOrders=Nema zabilježenih kupca narudžbe
# NoRecordedProposals=No recorded proposals NoRecordedProposals=Nema snimljene prijedlozi
# NoRecordedInvoices=No recorded customer's invoices NoRecordedInvoices=Nema zabilježenih kupca račune
# NoUnpaidCustomerBills=No unpaid customer's invoices NoUnpaidCustomerBills=Ne neplaćene račune kupca
# NoRecordedSupplierInvoices=No recorded supplier's invoices NoRecordedSupplierInvoices=Nema zabilježenih dobavljača računi
# NoUnpaidSupplierBills=No unpaid supplier's invoices NoUnpaidSupplierBills=Ne neplaćene račune dobavljača
# NoModifiedSupplierBills=No recorded supplier's invoices NoModifiedSupplierBills=Nema zabilježenih dobavljača računi
# NoRecordedProducts=No recorded products/services NoRecordedProducts=Nema zabilježenih proizvodi / usluge
# NoRecordedProspects=No recorded prospects NoRecordedProspects=Nema snimljene perspektive
# NoContractedProducts=No products/services contracted NoContractedProducts=Nema proizvoda / usluge ugovorene
# NoRecordedContracts=No recorded contracts NoRecordedContracts=Nema snimljene ugovori
# NoRecordedInterventions=No recorded interventions NoRecordedInterventions=Nema zabilježenih intervencija
# BoxLatestSupplierOrders=Latest supplier orders BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe
# BoxTitleLatestSupplierOrders=%s latest supplier orders BoxTitleLatestSupplierOrders=% s najnovijim narudžbe dobavljačima
# NoSupplierOrder=No recorded supplier order NoSupplierOrder=Ne bilježi dobavljač bi
# BoxCustomersInvoicesPerMonth=Customer invoices per month BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno
# BoxSuppliersInvoicesPerMonth=Supplier invoices per month BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno
# BoxCustomersOrdersPerMonth=Customer orders per month BoxCustomersOrdersPerMonth=Korisnički nalozi mjesečno
# BoxSuppliersOrdersPerMonth=Supplier orders per month BoxSuppliersOrdersPerMonth=Dobavljač naloga mjesečno
# BoxProposalsPerMonth=Proposals per month BoxProposalsPerMonth=Prijedlozi mjesečno
# NoTooLowStockProducts=No product under the low stock limit NoTooLowStockProducts=Nema proizvoda pod niskim granice dionica
# BoxProductDistribution=Products/Services distribution BoxProductDistribution=Proizvodi / usluge distribucije
# BoxProductDistributionFor=Distribution of %s for %s BoxProductDistributionFor=Raspodjela% s za% s
# ForCustomersInvoices=Customers invoices ForCustomersInvoices=Kupci računi
# ForCustomersOrders=Customers orders ForCustomersOrders=Kupci narudžbe
# ForProposals=Proposals ForProposals=Prijedlozi

2
htdocs/langs/hr_HR/companies.lang
View File

@ -26,7 +26,7 @@ IdCompany=Id kompanije
IdContact=Id kontakta IdContact=Id kontakta
Contacts=Kontakti/Adrese Contacts=Kontakti/Adrese
ThirdPartyContacts=Kontakti treće stranke ThirdPartyContacts=Kontakti treće stranke
ThirdPartyContact=Third party contact/address ThirdPartyContact=Stranka kontakt / adresa
StatusContactValidated=Status of contact/address StatusContactValidated=Status of contact/address
Company=Kompanija Company=Kompanija
CompanyName=Ime kompanije CompanyName=Ime kompanije

6
htdocs/langs/hr_HR/languages.lang
View File

@ -10,7 +10,7 @@ Language_da_DA=Danski
Language_da_DK=Danski Language_da_DK=Danski
Language_de_DE=Njemački Language_de_DE=Njemački
Language_de_AT=Njemački (Austrija) Language_de_AT=Njemački (Austrija)
Language_de_CH=German (Switzerland) Language_de_CH=Njemački (Švicarska)
Language_el_GR=Grčki Language_el_GR=Grčki
Language_en_AU=Engleski (Australija) Language_en_AU=Engleski (Australija)
Language_en_GB=Engleski (United Kingdom) Language_en_GB=Engleski (United Kingdom)
@ -20,7 +20,7 @@ Language_en_SA=Engleski (Saudijska Arabija)
Language_en_US=Engleski (United States) Language_en_US=Engleski (United States)
Language_en_ZA=Engleski (Južna Afrika) Language_en_ZA=Engleski (Južna Afrika)
Language_es_ES=Španjolski Language_es_ES=Španjolski
Language_es_DO=Spanish (Dominican Republic) Language_es_DO=Španjolski (Dominikanska Republika)
Language_es_AR=Španjolski (Argentina) Language_es_AR=Španjolski (Argentina)
Language_es_CL=Španjolski (Čile) Language_es_CL=Španjolski (Čile)
Language_es_HN=Španjolski (Honduras) Language_es_HN=Španjolski (Honduras)
@ -40,7 +40,7 @@ Language_fr_NC=Francuski (Nova Kaledonija)
Language_he_IL=Hebrew Language_he_IL=Hebrew
Language_hr_HR=Hrvatski Language_hr_HR=Hrvatski
Language_hu_HU=Mađarski Language_hu_HU=Mađarski
Language_id_ID=Indonesian Language_id_ID=Indonezijski
Language_is_IS=Islandski Language_is_IS=Islandski
Language_it_IT=Talijanski Language_it_IT=Talijanski
Language_ja_JP=Japanski Language_ja_JP=Japanski

29
htdocs/langs/lv_LV/admin.lang
View File

@ -3,7 +3,7 @@ Foundation=Organizācija
Version=Versija Version=Versija
VersionProgram=Programmas versija VersionProgram=Programmas versija
VersionLastInstall=Sākotnējā instalētā versija VersionLastInstall=Sākotnējā instalētā versija
VersionLastUpgrade=Jaunākajai jauninājums VersionLastUpgrade=Pēdējo reizi versija atjaunijnāta
VersionExperimental=Eksperimentāls VersionExperimental=Eksperimentāls
VersionDevelopment=Attīstība VersionDevelopment=Attīstība
VersionUnknown=Nezināms VersionUnknown=Nezināms
@ -35,7 +35,7 @@ ExternalUsers=Ārējie lietotāji
GlobalSetup=Globālie iestatījumi GlobalSetup=Globālie iestatījumi
GUISetup=Attēlojums GUISetup=Attēlojums
SetupArea=Iestatījumi SetupArea=Iestatījumi
FormToTestFileUploadForm=Veidlapa, lai pārbaudītu failu augšupielādes (pēc uzstādīšanas) FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
RemoveLock=Dzēst failu <b>%s</b>, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku. RemoveLock=Dzēst failu <b>%s</b>, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku.
RestoreLock=Atjaunot failu <b>%s</b> ar lasīšanas tiesībām tikai, lai bloķētu atjaunošanas rīka izmantošanu. RestoreLock=Atjaunot failu <b>%s</b> ar lasīšanas tiesībām tikai, lai bloķētu atjaunošanas rīka izmantošanu.
@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr v
ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta. ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta.
DictionarySetup=Vārdnīcas iestatījumi DictionarySetup=Vārdnīcas iestatījumi
Dictionary=Vārdnīcas Dictionary=Vārdnīcas
Chartofaccounts=Chart of accounts
Fiscalyear=Fiskālais gads
ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu
ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@ -354,7 +356,7 @@ HideDetailsOnPDF=Paslēpt produktu līnijas informāciju izveidotajā PDF
Library=Bibliotēka Library=Bibliotēka
UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
EnterRefToBuildUrl=Ievadiet atsauce objektu %s EnterRefToBuildUrl=Ievadiet atsauci objektam %s
GetSecuredUrl=Saņemt aprēķināto URL GetSecuredUrl=Saņemt aprēķināto URL
ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas
OldVATRates=Vecā PVN likme OldVATRates=Vecā PVN likme
@ -405,7 +407,7 @@ NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
Module0Name=Lietotāji un grupas Module0Name=Lietotāji un grupas
Module0Desc=Lietotāju un grupu vadība Module0Desc=Lietotāju un grupu vadība
Module1Name=Trešās personas Module1Name=Trešās personas
Module1Desc=Uzņēmumi un kontaktinformācija vadība (klientu, perspektīvas ...) Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...)
Module2Name=Tirdzniecība Module2Name=Tirdzniecība
Module2Desc=Komerciālā pārvaldība Module2Desc=Komerciālā pārvaldība
Module10Name=Grāmatvedība Module10Name=Grāmatvedība
@ -534,7 +536,7 @@ Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
Module59000Name=Malas Module59000Name=Malas
Module59000Desc=Moduli, lai pārvaldītu peļņu Module59000Desc=Moduli, lai pārvaldītu peļņu
Module60000Name=Komisijas Module60000Name=Komisijas
Module60000Desc=Moduli, lai pārvaldītu komisijas Module60000Desc=Modulis lai pārvaldītu komisijas
Module150010Name=Batch number, eat-by date and sell-by date Module150010Name=Batch number, eat-by date and sell-by date
Module150010Desc=batch number, eat-by date and sell-by date management for product Module150010Desc=batch number, eat-by date and sell-by date management for product
Permission11=Lasīt klientu rēķinus Permission11=Lasīt klientu rēķinus
@ -582,6 +584,9 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN
Permission93=Dzēst sociālās iemaksas un PVN Permission93=Dzēst sociālās iemaksas un PVN
Permission94=Eksportēt sociālās iemaksas Permission94=Eksportēt sociālās iemaksas
Permission95=Lasīt atskaites Permission95=Lasīt atskaites
Permission96=Nosūtīšanas iestatīšana
Permission97=Lasīt rēķina grāmatvedību nosūtīšana
Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas
Permission101=Lasīt sūtījumus Permission101=Lasīt sūtījumus
Permission102=Izveidot/mainīt sūtījumus Permission102=Izveidot/mainīt sūtījumus
Permission104=Apstiprināt sūtījumus Permission104=Apstiprināt sūtījumus
@ -672,7 +677,7 @@ Permission300=Lasīt svītrkodus
Permission301=Izveidot / mainīt svītrkodus Permission301=Izveidot / mainīt svītrkodus
Permission302=Dzēst svītrkodus Permission302=Dzēst svītrkodus
Permission311=Lasīt pakalpojumus Permission311=Lasīt pakalpojumus
Permission312=Piešķirt pakalpojumu līgumu Permission312=Piešķirt pakalpojumu līgumam
Permission331=Lasīt grāmatzīmes Permission331=Lasīt grāmatzīmes
Permission332=Izveidot/mainīt grāmatzīmes Permission332=Izveidot/mainīt grāmatzīmes
Permission333=Dzēst grāmatzīmes Permission333=Dzēst grāmatzīmes
@ -718,7 +723,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus
Permission1186=Pasūtīt piegādātāja pasūtījumus Permission1186=Pasūtīt piegādātāja pasūtījumus
Permission1187=Saņemšanu piegādātāju pasūtījumu Permission1187=Saņemšanu piegādātāju pasūtījumu
Permission1188=Dzēst piegādātāju pasūtījumus Permission1188=Dzēst piegādātāju pasūtījumus
Permission1201=Saņemt rezultātu eksportu Permission1201=Saņemt eksportēšanas rezultātu
Permission1202=Izveidot/Modificēt eksportu Permission1202=Izveidot/Modificēt eksportu
Permission1231=Lasīt piegādātāja rēķinus Permission1231=Lasīt piegādātāja rēķinus
Permission1232=Izveidot/mainīt piegādātāja rēķinus Permission1232=Izveidot/mainīt piegādātāja rēķinus
@ -730,11 +735,11 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde) Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
Permission1421=Eksporta klientu pasūtījumus un atribūti Permission1421=Eksporta klientu pasūtījumus un atribūti
Permission23001 = Lasīt Plānotais uzdevumu Permission23001 = Skatīt plānoto uzdevumu
Permission23002 = Izveidot / atjaunināt Plānotais uzdevumu Permission23002 = Izveidot/atjaunināt plānoto uzdevumu
Permission23003 = Dzēst plānoto uzdevumu Permission23003 = Dzēst plānoto uzdevumu
Permission23004 = Izpildīt plānoto uzdevumu Permission23004 = Izpildīt plānoto uzdevumu
Permission2401=Lasīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem
@ -785,7 +790,7 @@ BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
VATReceivedOnly=Īpaša likme nav jāmaksā VATReceivedOnly=Īpaša likme nav jāmaksā
VATManagement=PVN Vadība VATManagement=PVN Vadība
VATIsUsedDesc=PVN likme pēc noklusējuma, veidojot izredzes, rēķini, rīkojumi uc sekot aktīvo standarta noteikums: <br> Ja pārdevējs nav pakļauta PVN, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Ja (pārdošanas valstij = pērkot valsti), tad pēc noklusējuma PVN = PVN no produkta pārdošanas valstī. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienā, un preces ir transporta līdzekļi (auto, kuģis, lidmašīna), noklusējuma PVN = 0 (PVN būtu jāmaksā pircējam pie customoffice savas valsts, nevis pārdevējs). Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs nav uzņēmums, tad PVN pēc noklusējuma = PVN no pārdotā produkta. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs ir uzņēmums, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Else ierosinātā noklusējuma PVN = 0. Beigas varu. VATIsUsedDesc=PVN likme pēc noklusējuma, veidojot izredzes, rēķini, rīkojumi uc sekot aktīvo standarta noteikums: <br> Ja pārdevējs nav pakļauta PVN, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Ja (pārdošanas valstij = pērkot valsti), tad pēc noklusējuma PVN = PVN no produkta pārdošanas valstī. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienā, un preces ir transporta līdzekļi (auto, kuģis, lidmašīna), noklusējuma PVN = 0 (PVN būtu jāmaksā pircējam pie customoffice savas valsts, nevis pārdevējs). Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs nav uzņēmums, tad PVN pēc noklusējuma = PVN no pārdotā produkta. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs ir uzņēmums, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Else ierosinātā noklusējuma PVN = 0. Beigas varu.
VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijām, cilvēki ou mazos uzņēmumus. VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti.
VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta. VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta.
VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā. VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā.
##### Local Taxes ##### ##### Local Taxes #####
@ -1538,4 +1543,4 @@ Opened=Atvērts
Closed=Slēgts Closed=Slēgts
Format=Formāts Format=Formāts
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids

2
htdocs/langs/lv_LV/bills.lang
View File

@ -25,7 +25,7 @@ InvoiceReplacement=Nomaiņa rēķins
InvoiceReplacementAsk=Nomaiņa rēķins par rēķinu InvoiceReplacementAsk=Nomaiņa rēķins par rēķinu
InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
InvoiceAvoir=Kredīta piezīme InvoiceAvoir=Kredīta piezīme
InvoiceAvoirAsk=Kredītu piezīmi, lai koriģētu rēķinu InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu
InvoiceAvoirDesc=<b>Kredīts piezīme</b> ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram). InvoiceAvoirDesc=<b>Kredīts piezīme</b> ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake

26
htdocs/langs/lv_LV/orders.lang
View File

@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - orders # Dolibarr language file - Source file is en_US - orders
OrdersArea=Klienti pasūtījumu sadaļa OrdersArea=Klienti pasūtījumu sadaļa
SuppliersOrdersArea=Piegādātāji pasūtījumi platība SuppliersOrdersArea=Piegādātāji pasūtījumi platība
OrderCard=Lai karte OrderCard=Pasūtījumu kartiņa
OrderId=Pasūtījuma ID OrderId=Pasūtījuma ID
Order=Rīkojums Order=Rīkojums
Orders=Pasūtījumi Orders=Pasūtījumi
@ -9,25 +9,25 @@ OrderLine=Lai līnija
OrderFollow=Sekojiet līdzi OrderFollow=Sekojiet līdzi
OrderDate=Pasūtīt datumu OrderDate=Pasūtīt datumu
OrderToProcess=Pasūtījums, kas jāapstrādā OrderToProcess=Pasūtījums, kas jāapstrādā
NewOrder=Jauns rīkojums NewOrder=Jauns pasūtījums
ToOrder=Veicot pasūtījumu ToOrder=Veicot pasūtījumu
MakeOrder=Veicot pasūtījumu MakeOrder=Veicot pasūtījumu
SupplierOrder=Piegādātājs rīkojums SupplierOrder=Piegādātājs rīkojums
SuppliersOrders=Piegādātāji pasūtījumi SuppliersOrders=Piegādātāji pasūtījumi
SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
CustomerOrder=Klienta rīkojums CustomerOrder=Klienta rīkojums
CustomersOrders=Klienta-u pasūtījumi CustomersOrders=Klientu pasūtījumi
CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi
CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas
OrdersToValid=Klienta pasūtījumu apstiprināšanai, OrdersToValid=Klienta pasūtījumu apstiprināšanai,
OrdersToBill=Klienta rīkojumi piegādāts OrdersToBill=Klienta pasūtījumi piegādāti
OrdersInProcess=Klienta rīkojumus procesā OrdersInProcess=Klienta pasūtījumi procesā
OrdersToProcess=Klienta rīkojumi apstrādāt OrdersToProcess=Klienta pasūtījumi kas jāapstrādā
SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt
StatusOrderCanceledShort=Atcelts StatusOrderCanceledShort=Atcelts
StatusOrderDraftShort=Projekts StatusOrderDraftShort=Projekts
StatusOrderValidatedShort=Validēta StatusOrderValidatedShort=Apstiprināts
StatusOrderSentShort=Šajā procesā StatusOrderSentShort=Procesā
StatusOrderSent=Sūtījuma procesā StatusOrderSent=Sūtījuma procesā
StatusOrderOnProcessShort=Reģistratūra StatusOrderOnProcessShort=Reģistratūra
StatusOrderProcessedShort=Apstrādāti StatusOrderProcessedShort=Apstrādāti
@ -40,7 +40,7 @@ StatusOrderReceivedPartiallyShort=Daļēji saņemti
StatusOrderReceivedAllShort=Viss saņemts StatusOrderReceivedAllShort=Viss saņemts
StatusOrderCanceled=Atcelts StatusOrderCanceled=Atcelts
StatusOrderDraft=Projekts (ir jāapstiprina) StatusOrderDraft=Projekts (ir jāapstiprina)
StatusOrderValidated=Validēta StatusOrderValidated=Apstiprināts
StatusOrderOnProcess=Gaida, lai saņemtu StatusOrderOnProcess=Gaida, lai saņemtu
StatusOrderProcessed=Apstrādāts StatusOrderProcessed=Apstrādāts
StatusOrderToBill=Piegādāts StatusOrderToBill=Piegādāts
@ -81,9 +81,9 @@ AllOrders=Visi pasūtījumi
NbOfOrders=Pasūtījumu skaits NbOfOrders=Pasūtījumu skaits
OrdersStatistics=Pasūtījuma-u statistika OrdersStatistics=Pasūtījuma-u statistika
OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika
NumberOfOrdersByMonth=Pasutījumu skaits pa mēnešiem NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem
AmountOfOrdersByMonthHT=Summa rīkojumus mēnesī (neto pēc nodokļiem) AmountOfOrdersByMonthHT=Summa pasūtījumi mēnesī (bez nodokļiem)
ListOfOrders=Saraksts pasūtījumu ListOfOrders=Pasūtījumu saraksts
CloseOrder=Aizvērt kārtība CloseOrder=Aizvērt kārtība
ConfirmCloseOrder=Vai jūs tiešām vēlaties, lai uzstādītu šo rīkojumu deliverd? Pēc tam, kad pasūtījums tiek piegādāts, to var iestatīt, lai jāmaksā. ConfirmCloseOrder=Vai jūs tiešām vēlaties, lai uzstādītu šo rīkojumu deliverd? Pēc tam, kad pasūtījums tiek piegādāts, to var iestatīt, lai jāmaksā.
ConfirmCloseOrderIfSending=Vai jūs tiešām vēlaties, lai aizvērtu šo pasūtījumu? Jums jāslēdz rīkojumu tikai tad, kad visi kuģniecības tiek darīts. ConfirmCloseOrderIfSending=Vai jūs tiešām vēlaties, lai aizvērtu šo pasūtījumu? Jums jāslēdz rīkojumu tikai tad, kad visi kuģniecības tiek darīts.
@ -95,7 +95,7 @@ ConfirmMakeOrder=Vai jūs tiešām vēlaties, lai apstiprinātu veicāt šo rīk
GenerateBill=Izveidot rēķinu GenerateBill=Izveidot rēķinu
ClassifyShipped=Klasificēt piegādāts ClassifyShipped=Klasificēt piegādāts
ClassifyBilled=Klasificēt rēķins ClassifyBilled=Klasificēt rēķins
ComptaCard=Grāmatvedība karte ComptaCard=Grāmatvedības kartiņa
DraftOrders=Projekts pasūtījumi DraftOrders=Projekts pasūtījumi
RelatedOrders=Saistītie pasūtījumi RelatedOrders=Saistītie pasūtījumi
OnProcessOrders=Pasūtījumi procesā OnProcessOrders=Pasūtījumi procesā

6
htdocs/langs/lv_LV/stocks.lang
View File

@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - stocks # Dolibarr language file - Source file is en_US - stocks
WarehouseCard=Noliktava karte WarehouseCard=Noliktava kartiņa
Warehouse=Noliktava Warehouse=Noliktava
Warehouses=Noliktavas Warehouses=Noliktavas
NewWarehouse=Jauns noliktavu / Noliktavas platība NewWarehouse=Jauns noliktavu / Noliktavas platība
@ -35,7 +35,7 @@ Unit=Vienība
StockCorrection=Labot krājumus StockCorrection=Labot krājumus
StockTransfer=Krājumu pārvietošana StockTransfer=Krājumu pārvietošana
StockMovement=Pārvietot StockMovement=Pārvietot
StockMovements=Krājumu pārvieošanas StockMovements=Krājumu pārvietošanas
LabelMovement=Kustību nosaukums LabelMovement=Kustību nosaukums
NumberOfUnit=Vienību skaits NumberOfUnit=Vienību skaits
UnitPurchaseValue=Vienības iepirkuma cena UnitPurchaseValue=Vienības iepirkuma cena
@ -73,7 +73,7 @@ MininumStockShort=Krājumu min
StockUpShort=Krājumi StockUpShort=Krājumi
IdWarehouse=Id noliktava IdWarehouse=Id noliktava
DescWareHouse=Apraksts noliktava DescWareHouse=Apraksts noliktava
LieuWareHouse=Lokalizācija noliktava LieuWareHouse=Lokālā noliktava
WarehousesAndProducts=Noliktavas un produkti WarehousesAndProducts=Noliktavas un produkti
AverageUnitPricePMPShort=Vidējais svērtais ieejas cena AverageUnitPricePMPShort=Vidējais svērtais ieejas cena
AverageUnitPricePMP=Vidējais svērtais ieejas cena AverageUnitPricePMP=Vidējais svērtais ieejas cena

53
htdocs/langs/ru_RU/orders.lang
View File

@ -1,10 +1,10 @@
# Dolibarr language file - Source file is en_US - orders # Dolibarr language file - Source file is en_US - orders
OrdersArea=Клиенты заказы области OrdersArea=Раздел заказов клиентов
SuppliersOrdersArea=Поставщики заказы области SuppliersOrdersArea=Раздел заказов поставщиков
OrderCard=Заказать карту OrderCard=Карточка заказа
# OrderId=Order Id OrderId=Идентификатор заказа
Order=Заказ Order=Заказ
Orders=Приказы Orders=Заказы
OrderLine=Заказ линии OrderLine=Заказ линии
OrderFollow=Последующие меры OrderFollow=Последующие меры
OrderDate=Дата заказа OrderDate=Дата заказа
@ -28,7 +28,7 @@ StatusOrderCanceledShort=Отменен
StatusOrderDraftShort=Черновик StatusOrderDraftShort=Черновик
StatusOrderValidatedShort=Подтвержденные StatusOrderValidatedShort=Подтвержденные
StatusOrderSentShort=В процессе StatusOrderSentShort=В процессе
# StatusOrderSent=Shipment in process StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=В процессе StatusOrderOnProcessShort=В процессе
StatusOrderProcessedShort=Обработано StatusOrderProcessedShort=Обработано
StatusOrderToBillShort=В законопроекте StatusOrderToBillShort=В законопроекте
@ -53,9 +53,9 @@ ShippingExist=Отгрузки существует
DraftOrWaitingApproved=Проект или утверждены еще не заказал DraftOrWaitingApproved=Проект или утверждены еще не заказал
DraftOrWaitingShipped=Проект или подтверждены не отгружен DraftOrWaitingShipped=Проект или подтверждены не отгружен
MenuOrdersToBill=Заказы на законопроект MenuOrdersToBill=Заказы на законопроект
# MenuOrdersToBill2=Orders to bill MenuOrdersToBill2=Orders to bill
SearchOrder=Поиск тем SearchOrder=Поиск тем
# SearchACustomerOrder=Search a customer order SearchACustomerOrder=Search a customer order
ShipProduct=Судно продукта ShipProduct=Судно продукта
Discount=Скидка Discount=Скидка
CreateOrder=Создать заказ CreateOrder=Создать заказ
@ -68,11 +68,11 @@ CancelOrder=Отмена порядка
AddOrder=Добавить тему AddOrder=Добавить тему
AddToMyOrders=Добавить в мои заказы AddToMyOrders=Добавить в мои заказы
AddToOtherOrders=Добавить в других заказов AddToOtherOrders=Добавить в других заказов
# AddToDraftOrders=Add to draft order AddToDraftOrders=Add to draft order
ShowOrder=Показать порядок ShowOrder=Показать порядок
NoOpenedOrders=Нет открыл заказов NoOpenedOrders=Нет открыл заказов
NoOtherOpenedOrders=Никакие другие открыли заказов NoOtherOpenedOrders=Никакие другие открыли заказов
# NoDraftOrders=No draft orders NoDraftOrders=No draft orders
OtherOrders=Другие заказы OtherOrders=Другие заказы
LastOrders=Последнее %s заказов LastOrders=Последнее %s заказов
LastModifiedOrders=Последнее% с измененными заказов LastModifiedOrders=Последнее% с измененными заказов
@ -82,7 +82,7 @@ NbOfOrders=Количество заказов
OrdersStatistics=Приказы Статистика OrdersStatistics=Приказы Статистика
OrdersStatisticsSuppliers=Поставщик заказов статистика OrdersStatisticsSuppliers=Поставщик заказов статистика
NumberOfOrdersByMonth=Количество заказов в месяц NumberOfOrdersByMonth=Количество заказов в месяц
# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Список заказов ListOfOrders=Список заказов
CloseOrder=Закрыть тему CloseOrder=Закрыть тему
ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет. ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет.
@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Вы уверены, что хотите, чтобы во
ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ? ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ?
ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ <b>на %s?</b> ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ <b>на %s?</b>
GenerateBill=Создать счет-фактуру GenerateBill=Создать счет-фактуру
# ClassifyShipped=Classify delivered ClassifyShipped=Classify delivered
ClassifyBilled=Классифицировать "Billed" ClassifyBilled=Классифицировать "Billed"
ComptaCard=Бухгалтерия карту ComptaCard=Бухгалтерия карту
DraftOrders=Проект распоряжения DraftOrders=Проект распоряжения
@ -101,7 +101,6 @@ RelatedOrders=Похожие заказов
OnProcessOrders=В процессе заказов OnProcessOrders=В процессе заказов
RefOrder=Ref. заказ RefOrder=Ref. заказ
RefCustomerOrder=Ref. Для клиента RefCustomerOrder=Ref. Для клиента
CustomerOrder=Для клиентов
RefCustomerOrderShort=Ref. CUST. заказ RefCustomerOrderShort=Ref. CUST. заказ
SendOrderByMail=Отправить заказ по почте SendOrderByMail=Отправить заказ по почте
ActionsOnOrder=Меры по заказу ActionsOnOrder=Меры по заказу
@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_
Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s' Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s'
Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s' Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s'
# Error_OrderNotChecked=No orders to invoice selected Error_OrderNotChecked=No orders to invoice selected
# Sources # Sources
OrderSource0=Коммерческое предложение OrderSource0=Коммерческое предложение
OrderSource1=Интернет OrderSource1=Интернет
@ -144,25 +141,23 @@ OrderSource5=Коммерческие
OrderSource6=Склад OrderSource6=Склад
QtyOrdered=Количество заказанных QtyOrdered=Количество заказанных
AddDeliveryCostLine=Добавить доставки Стоимость линии с указанием веса заказа AddDeliveryCostLine=Добавить доставки Стоимость линии с указанием веса заказа
# Documents models # Documents models
PDFEinsteinDescription=Для полной модели (logo. ..) PDFEinsteinDescription=Для полной модели (logo. ..)
PDFEdisonDescription=Простая модель для PDFEdisonDescription=Простая модель для
# PDFProformaDescription=A complete proforma invoice (logo…) PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes # Orders modes
OrderByMail=Почта OrderByMail=Почта
OrderByFax=Факс OrderByFax=Факс
OrderByEMail=EMail OrderByEMail=EMail
OrderByWWW=Интернет OrderByWWW=Интернет
OrderByPhone=Телефон OrderByPhone=Телефон
CreateInvoiceForThisCustomer=Bill orders
# CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable
# NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. MenuOrdersToBill2=Orders to bill
# MenuOrdersToBill2=Orders to bill OrderCreation=Order creation
# OrderCreation=Order creation Ordered=Ordered
# Ordered=Ordered OrderCreated=Your orders have been created
# OrderCreated=Your orders have been created OrderFail=An error happened during your orders creation
# OrderFail=An error happened during your orders creation CreateOrders=Create orders
# CreateOrders=Create orders ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".

29
htdocs/langs/tr_TR/agenda.lang
View File

@ -2,14 +2,14 @@
IdAgenda=Kimlik etkinliği IdAgenda=Kimlik etkinliği
Actions=Eylemler Actions=Eylemler
ActionsArea=Eylem alanı (Olaylar ve görevler) ActionsArea=Eylem alanı (Olaylar ve görevler)
Agenda= Gündem Agenda=Gündem
Agendas= Gündemler Agendas=Gündemler
Calendar= Takvim Calendar=Takvim
Calendars= Takvimler Calendars=Takvimler
LocalAgenda=Yerel takvim LocalAgenda=İç takvim
AffectedTo=Etkilenen AffectedTo=Etkilenen
DoneBy=Yapan DoneBy=Yapan
Event=Event Event=Etkinlik
Events=Etkinlikler Events=Etkinlikler
EventsNb=Etkinlik sayısı EventsNb=Etkinlik sayısı
MyEvents=Etkinliklerim MyEvents=Etkinliklerim
@ -22,7 +22,7 @@ MenuToDoActions=Tüm sonlanmayan eylemler
MenuDoneActions=Tüm sonlanan eylemler MenuDoneActions=Tüm sonlanan eylemler
MenuToDoMyActions=Sonlanmayan eylemlerim MenuToDoMyActions=Sonlanmayan eylemlerim
MenuDoneMyActions=Sonlanan eylemlerim MenuDoneMyActions=Sonlanan eylemlerim
ListOfEvents=Dolibarr eylem listesi ListOfEvents=Etkinlik listesi (iç takvim)
ActionsAskedBy=Eylemi bildiren ActionsAskedBy=Eylemi bildiren
ActionsToDoBy=Eylemden etkilenen ActionsToDoBy=Eylemden etkilenen
ActionsDoneBy=Eylemi yapan ActionsDoneBy=Eylemi yapan
@ -34,7 +34,7 @@ ViewList=Liste görünümü
ViewCal=Ay görünümü ViewCal=Ay görünümü
ViewDay=Gün görünümü ViewDay=Gün görünümü
ViewWeek=Hafta görünümü ViewWeek=Hafta görünümü
ViewPerUser=Per user view ViewPerUser=Kullanıcı görünümü başına
ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm
AutoActions= Gündemin otomatik doldurulması AutoActions= Gündemin otomatik doldurulması
AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz olayları tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen eylemler gündeme dahil edilecektir. AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz olayları tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen eylemler gündeme dahil edilecektir.
@ -51,7 +51,7 @@ OrderRefusedInDolibarr=Reddedilen teklif %s
OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
OrderCanceledInDolibarr=%s Siparişi iptal edildi OrderCanceledInDolibarr=%s Siparişi iptal edildi
InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı
ProposalSentByEMail=%s Ticari teklifi Eposta ile gönderildi ProposalSentByEMail=%s Teklifi Eposta ile gönderildi
OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi
InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi
SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi
@ -76,15 +76,16 @@ AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
Busy=Meşgul Busy=Meşgul
ExportDataset_event1=Gündem etkinlikleri listesi ExportDataset_event1=Gündem etkinlikleri listesi
DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6)
DefaultWorkingHours=Default working hours in day (Example: 9-18) DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18)
# External Sites ical # External Sites ical
ExportCal=Takvim ver ExportCal=Takvim ver
ExtSites=Dış takvimleri içeaktar ExtSites=Dış takvimleri içeaktar
ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez.
ExtSitesNbOfAgenda=Takvimlerin sayısı ExtSitesNbOfAgenda=Takvimlerin sayısı
AgendaExtNb=Takvim sayısı %s AgendaExtNb=Takvim sayısı %s
ExtSiteUrlAgenda=.ical dosyasına erişmek için URL ExtSiteUrlAgenda=.ical dosyasına erişmek için URL
ExtSiteNoLabel=Tanımlama yok ExtSiteNoLabel=Tanımlama yok
WorkingTimeRange=Working time range WorkingTimeRange=Çalışma saati aralığı
WorkingDaysRange=Working days range WorkingDaysRange=Çalışma günleri aralığı
AddEvent=Etkinlik oluştur

12
htdocs/langs/tr_TR/bills.lang
View File

@ -85,7 +85,7 @@ ClassifyPaid=‘Ödendi’ olarak sınıflandır
ClassifyPaidPartially=‘Kısmen ödendi’ olarak sınıflandır ClassifyPaidPartially=‘Kısmen ödendi’ olarak sınıflandır
ClassifyCanceled=’Terkedildi’ olarak sınıflandır ClassifyCanceled=’Terkedildi’ olarak sınıflandır
ClassifyClosed=‘Kapalı’ olarak sınıflandır ClassifyClosed=‘Kapalı’ olarak sınıflandır
ClassifyUnBilled=Classify 'Unbilled' ClassifyUnBilled=Sınıflandırma 'Faturalanmadı'
CreateBill=Fatura oluştur CreateBill=Fatura oluştur
AddBill=Fatura ya da alacak dekontu ekle AddBill=Fatura ya da alacak dekontu ekle
AddToDraftInvoices=Taslak fatura ekle AddToDraftInvoices=Taslak fatura ekle
@ -198,8 +198,8 @@ Rest=Bekleyen
AmountExpected=İstenen tutar AmountExpected=İstenen tutar
ExcessReceived=Fazla alınan ExcessReceived=Fazla alınan
EscompteOffered=Teklif edilen indirim (vadeden önce ödemede) EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
SendBillRef=Submission of invoice %s SendBillRef=%s faturasının gönderilmesi
SendReminderBillRef=Submission of invoice %s (reminder) SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
StandingOrders=Ödeme talimatları StandingOrders=Ödeme talimatları
StandingOrder=Ödeme talimatı StandingOrder=Ödeme talimatı
NoDraftBills=Hiç taslak fatura yok NoDraftBills=Hiç taslak fatura yok
@ -224,7 +224,7 @@ DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının d
NonPercuRecuperable=Kurtarılamaz NonPercuRecuperable=Kurtarılamaz
SetConditions=Ödeme koşullarını ayarla SetConditions=Ödeme koşullarını ayarla
SetMode=Ödeme biçimini ayarla SetMode=Ödeme biçimini ayarla
Billed=Faturalandı Billed=Faturalanmış
RepeatableInvoice=Ön tanımlı fatura RepeatableInvoice=Ön tanımlı fatura
RepeatableInvoices=Ön tanımlı faturalar RepeatableInvoices=Ön tanımlı faturalar
Repeatable=Ön tanımlı Repeatable=Ön tanımlı
@ -296,8 +296,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir
ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz? ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
RelatedBill=İlgili fatura RelatedBill=İlgili fatura
RelatedBills=İlgili faturalar RelatedBills=İlgili faturalar
LatestRelatedBill=Latest related invoice LatestRelatedBill=Son ilgili fatura
WarningBillExist=Warning, one or more invoice already exist WarningBillExist=Uyarı, bir yada çok fatura zaten var
# PaymentConditions # PaymentConditions
PaymentConditionShortRECEP=Derhal PaymentConditionShortRECEP=Derhal

2
htdocs/langs/tr_TR/boxes.lang
View File

@ -7,7 +7,7 @@ BoxLastSupplierBills=Son tedarikçi faturaları
BoxLastCustomerBills=Son müşteri faturaları BoxLastCustomerBills=Son müşteri faturaları
BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları
BoxOldestUnpaidSupplierBills=En eski ödenmemiş tedarikçi faturaları BoxOldestUnpaidSupplierBills=En eski ödenmemiş tedarikçi faturaları
BoxLastProposals=Son ticari teklifler BoxLastProposals=Son teklifler
BoxLastProspects=Son adaylar BoxLastProspects=Son adaylar
BoxLastCustomers=Son değiştirilen müşteriler BoxLastCustomers=Son değiştirilen müşteriler
BoxLastSuppliers=Son değiştirilen tedarikçiler BoxLastSuppliers=Son değiştirilen tedarikçiler

6
htdocs/langs/tr_TR/commercial.lang
View File

@ -44,8 +44,8 @@ DoneActions=Tamamlanan etkinlikler
DoneActionsFor=%s için tamamlanan etkinlikler DoneActionsFor=%s için tamamlanan etkinlikler
ToDoActions=Tamamlanmamış etkinlikler ToDoActions=Tamamlanmamış etkinlikler
ToDoActionsFor=%s için tamalanmamış etkinlikler ToDoActionsFor=%s için tamalanmamış etkinlikler
SendPropalRef=%s teklifini gönder SendPropalRef=%s Teklifinin sunulması
SendOrderRef=% siparişini gönder SendOrderRef=%s Teklifinin sunulması
StatusNotApplicable=Uygulanamaz StatusNotApplicable=Uygulanamaz
StatusActionToDo=Yapılacaklar StatusActionToDo=Yapılacaklar
StatusActionDone=Tamamla StatusActionDone=Tamamla
@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı
DateActionPlanned=Planlanan etkinlik tarihi DateActionPlanned=Planlanan etkinlik tarihi
DateActionDone=Etkinliğin yapıldığı tarih DateActionDone=Etkinliğin yapıldığı tarih
ActionAskedBy=Etkinliği sunan ActionAskedBy=Etkinliği sunan
ActionAffectedTo=Etkinlikten etkilenen ActionAffectedTo=Etkinlik sahibi
ActionDoneBy=Etkinliği yapan ActionDoneBy=Etkinliği yapan
ActionUserAsk=Raporlayan ActionUserAsk=Raporlayan
ErrorStatusCantBeZeroIfStarted=Eğer <b>Yapıldığı tarih</b> alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda '<b>Durum</b>' alanı 0%% olamaz. ErrorStatusCantBeZeroIfStarted=Eğer <b>Yapıldığı tarih</b> alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda '<b>Durum</b>' alanı 0%% olamaz.

20
htdocs/langs/tr_TR/companies.lang
View File

@ -76,7 +76,7 @@ PhoneMobile=Mobil
No_Email=Toplu e-posta gönderme No_Email=Toplu e-posta gönderme
Fax=Faks Fax=Faks
Zip=Posta Kodu Zip=Posta Kodu
Town=Şehir Town=ilçesi
Web=Web Web=Web
Poste= Durumu Poste= Durumu
DefaultLang=Varsayılan dili DefaultLang=Varsayılan dili
@ -91,8 +91,8 @@ LocalTax2IsUsedES= IRPF kullanılır
LocalTax2IsNotUsedES= IRPF kullanılmaz LocalTax2IsNotUsedES= IRPF kullanılmaz
LocalTax1ES=RE LocalTax1ES=RE
LocalTax2ES=IRPF LocalTax2ES=IRPF
TypeLocaltax1ES=RE Type TypeLocaltax1ES=RE Türü
TypeLocaltax2ES=IRPF Type TypeLocaltax2ES=IRPF Türü
TypeES=Türü TypeES=Türü
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Müşteri kodu geçersiz WrongCustomerCode=Müşteri kodu geçersiz
@ -270,7 +270,7 @@ NoContactDefined=Bu üçüncü parti için kişi tanımlanmamış
DefaultContact=Varsayılan kişi DefaultContact=Varsayılan kişi
AddCompany=Firma ekle AddCompany=Firma ekle
AddThirdParty=Üçüncü parti ekle AddThirdParty=Üçüncü parti ekle
DeleteACompany=Bir firma sil DeleteACompany=Firma sil
PersonalInformations=Kişisel bilgiler PersonalInformations=Kişisel bilgiler
AccountancyCode=Muhasebe kodu AccountancyCode=Muhasebe kodu
CustomerCode=Müşteri kodu CustomerCode=Müşteri kodu
@ -302,7 +302,7 @@ ContactForProposals=Teklif yetkilisi
ContactForContracts=Sözleşme yetkilisi ContactForContracts=Sözleşme yetkilisi
ContactForInvoices=Fatura yetkilisi ContactForInvoices=Fatura yetkilisi
NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir
NoContactForAnyProposal=Bu kişi herhangi bir ticari teklifin yetkilisi değildir NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir
NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir
NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir
NewContact=Yeni kişi NewContact=Yeni kişi
@ -311,7 +311,7 @@ LastContacts=Son kişiler
MyContacts=Kişilerim MyContacts=Kişilerim
Phones=Telefonlar Phones=Telefonlar
Capital=Sermaye Capital=Sermaye
CapitalOf=%s nin sermayesi CapitalOf=%s firmasının sermayesi
EditCompany=Firma düzenle EditCompany=Firma düzenle
EditDeliveryAddress=Teslimat adresi düzenle EditDeliveryAddress=Teslimat adresi düzenle
ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
@ -386,9 +386,9 @@ SupplierCategory=Tedarikçi kategorisi
JuridicalStatus200=Bağımsız JuridicalStatus200=Bağımsız
DeleteFile=Dosya sil DeleteFile=Dosya sil
ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz? ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz?
AllocateCommercial=Bir ticari tahsis et AllocateCommercial=Satış temsilcisine atanmış
SelectCountry=Bir ülke seçin SelectCountry=Bir ülke seç
SelectCompany=Bir üçüncü parti seçin SelectCompany=Bir üçüncü parti seç
Organization=Kuruluş Organization=Kuruluş
AutomaticallyGenerated=Otomatikman oluşturulur AutomaticallyGenerated=Otomatikman oluşturulur
FiscalYearInformation=Mali yıla ait bilgi FiscalYearInformation=Mali yıla ait bilgi
@ -403,7 +403,7 @@ UniqueThirdParties=Toplam eşsiz üçüncü parti
InActivity=Açık InActivity=Açık
ActivityCeased=Kapalı ActivityCeased=Kapalı
ActivityStateFilter=Etkinlik durumu ActivityStateFilter=Etkinlik durumu
ProductsIntoElements=Ürünleri %s 'li listele ProductsIntoElements=Ürünleri %s te listele
CurrentOutstandingBill=Geçerli bekleyen fatura CurrentOutstandingBill=Geçerli bekleyen fatura
OutstandingBill=Ödenmemiş fatura için ençok tutar OutstandingBill=Ödenmemiş fatura için ençok tutar
OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı

20
htdocs/langs/tr_TR/compta.lang
View File

@ -123,7 +123,7 @@ CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>. CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
CalcModeDebt=Mod <b>%sAlacaklar-Borçlar, taahhüt hesabı%s için</b>. CalcModeDebt=Mod <b>%sAlacaklar-Borçlar, taahhüt hesabı%s için</b>.
CalcModeEngagement=Mod <b>%sAlacaklar-Borçlar, kasa hesabı%s için</b>. CalcModeEngagement=Mod <b>%sAlacaklar-Borçlar, kasa hesabı%s için</b>.
CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b> CalcModeLT1= Müşteri faturaları için mod <b>%sRE tedrikçi faturaları için mod %s</b>
CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b> CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b> CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b> CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
@ -195,12 +195,12 @@ CalculationRuleDesc=Toplam KDV hesabı için 2 yöntem vardır:<br>Yöntem 1, he
CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kullanmak üzere uygun yöntemi seçin ve tedarikçiyle aynı sonucu alın. CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kullanmak üzere uygun yöntemi seçin ve tedarikçiyle aynı sonucu alın.
TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın). TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
CalculationMode=Hesaplama modu CalculationMode=Hesaplama modu
AccountancyJournal=Accountancy code journal AccountancyJournal=Muhasebe kodu günlüğü
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu
ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu
ACCOUNTING_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu
ACCOUNTING_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu
ACCOUNTING_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu
ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu
ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu

12
htdocs/langs/tr_TR/dict.lang
View File

@ -248,11 +248,11 @@ CountryBL=Saint Barthelemy
CountryMF=Saint Martin CountryMF=Saint Martin
##### Civilities ##### ##### Civilities #####
CivilityMME=Mrs. CivilityMME=Bn.
CivilityMR=Mr. CivilityMR=Bay
CivilityMLE=Ms. CivilityMLE=Bn.
CivilityMTRE=Master CivilityMTRE=Master
CivilityDR=Doctor CivilityDR=Doktor
##### Currencies ##### ##### Currencies #####
Currencyeuros=Euro Currencyeuros=Euro
CurrencyAUD=AU Doları CurrencyAUD=AU Doları
@ -290,6 +290,8 @@ CurrencySingXOF=CFA Frangı BCEAO
CurrencyXPF=CFP Frangı CurrencyXPF=CFP Frangı
CurrencySingXPF=CFP Frangı CurrencySingXPF=CFP Frangı
CurrencyCentSingEUR=cent CurrencyCentSingEUR=cent
CurrencyCentINR=paisa
CurrencyCentSingINR=paise
CurrencyThousandthSingTND=thousandth CurrencyThousandthSingTND=thousandth
#### Input reasons ##### #### Input reasons #####
DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_INTE=Internet
@ -297,7 +299,7 @@ DemandReasonTypeSRC_CAMP_MAIL=Posta kampanyası
DemandReasonTypeSRC_CAMP_EMAIL=Eposta kampanyası DemandReasonTypeSRC_CAMP_EMAIL=Eposta kampanyası
DemandReasonTypeSRC_CAMP_PHO=Telefon kampanyası DemandReasonTypeSRC_CAMP_PHO=Telefon kampanyası
DemandReasonTypeSRC_CAMP_FAX=Faks kampanyası DemandReasonTypeSRC_CAMP_FAX=Faks kampanyası
DemandReasonTypeSRC_COMM=Ticari görüşme DemandReasonTypeSRC_COMM=Ticari ilgili
DemandReasonTypeSRC_SHOP=İş yerinde görüşme DemandReasonTypeSRC_SHOP=İş yerinde görüşme
DemandReasonTypeSRC_WOM=Başkasından duyarak DemandReasonTypeSRC_WOM=Başkasından duyarak
DemandReasonTypeSRC_PARTNER=İş Ortağı DemandReasonTypeSRC_PARTNER=İş Ortağı

4
htdocs/langs/tr_TR/errors.lang
View File

@ -136,6 +136,8 @@ ErrorBadFormat=Hatalı biçim!
ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz. ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz.
ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun.
ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi. ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi.
ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez
ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez
# Warnings # Warnings
WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
@ -153,4 +155,4 @@ WarningCloseAlways=Uyarı, kaynak ve hedef öğeleri arasında tutar farklı da
WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sayfaları ciddi olarak yavaşlatır. WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sayfaları ciddi olarak yavaşlatır.
WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın) WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın)
WarningNotRelevant=Bu veri kümesi için alakasız işlem WarningNotRelevant=Bu veri kümesi için alakasız işlem
WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır.

4
htdocs/langs/tr_TR/exports.lang
View File

@ -125,8 +125,8 @@ BankAccountNumber=Hesap numarası
BankAccountNumberKey=Anahtar BankAccountNumberKey=Anahtar
SpecialCode=Özel kod SpecialCode=Özel kod
ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir
ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi<br> > YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi<br> < YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi
ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values ExportNumericFilter='NNNNN' bir değere göre süzgeç<br>'NNNNN+NNNNN' bir değerler aralığı süzgeçi<br>'&gt;NNNNN' düşük değerlere göre süzgeç<br>'&gt;NNNNN' yüksek değerlere göre süzgeç
## filters ## filters
SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın. SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın.
FilterableFields=Süzülebilir Champs FilterableFields=Süzülebilir Champs

6
htdocs/langs/tr_TR/interventions.lang
View File

@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası :
NameAndSignatureOfExternalContact=Müşterinin adı ve imzası : NameAndSignatureOfExternalContact=Müşterinin adı ve imzası :
DocumentModelStandard=Müdahaleler için standart belge modeli DocumentModelStandard=Müdahaleler için standart belge modeli
InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları
ClassifyBilled="Faturalandırıldı" ClassifyBilled=Sınıflandırma "Faturalanmış"
StatusInterInvoiced=Faturalandırılmış ClassifyUnBilled=Sınıflandırma "Faturalanmadı"
StatusInterInvoiced=Faturalanmış
RelatedInterventions=İlgili müdahaleler RelatedInterventions=İlgili müdahaleler
ShowIntervention=Müdahale göster ShowIntervention=Müdahale göster
SendInterventionRef=%s müdahalesinin sunulması
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi
TypeContact_fichinter_internal_INTERVENING=Müdahalede TypeContact_fichinter_internal_INTERVENING=Müdahalede

14
htdocs/langs/tr_TR/link.lang
View File

@ -1,8 +1,8 @@
LinkANewFile=Link a new file/document LinkANewFile=Yeni bir dosya/belge bağlantıla
LinkedFiles=Linked files and documents LinkedFiles=Bağlantılı dosyalar ve belgeler
NoLinkFound=No registered links NoLinkFound=Kayıtlı bağlantı yok
LinkComplete=The file has been linked successfully LinkComplete=Dosya bağlantısı başarılı
ErrorFileNotLinked=The file could not be linked ErrorFileNotLinked=The file could not be linked
LinkRemoved=The link %s has been removed LinkRemoved=Bağlantı %s kaldırıldı
ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>' ErrorFailedToDeleteLink= Bu bağlantı kaldırılamadı '<b>%s</b>'
ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>' ErrorFailedToUpdateLink= Bu bağlantı güncellemesi yapılamadı '<b>%s</b>'

11
htdocs/langs/tr_TR/main.lang
View File

@ -345,8 +345,8 @@ Ref=Ref.
RefSupplier=Ref. tedarikçi RefSupplier=Ref. tedarikçi
RefPayment=Ref. ödeme RefPayment=Ref. ödeme
CommercialProposalsShort=Teklifler CommercialProposalsShort=Teklifler
Comment=Yorum Comment=Açıklama
Comments=Yorumlar Comments=Açıklamalar
ActionsToDo=Yapılacak eylemler ActionsToDo=Yapılacak eylemler
ActionsDone=Biten eylemler ActionsDone=Biten eylemler
ActionsToDoShort=Yapılacaklar ActionsToDoShort=Yapılacaklar
@ -645,6 +645,7 @@ OptionalFieldsSetup=Ekstra öznitelik ayarları
URLPhoto=Fotoğraf/logo İnternet adresi URLPhoto=Fotoğraf/logo İnternet adresi
SetLinkToThirdParty=Başka bir üçüncü parti bağlantısı SetLinkToThirdParty=Başka bir üçüncü parti bağlantısı
CreateDraft=Taslak oluştur CreateDraft=Taslak oluştur
SetToDraft=Taslağa geri dön
ClickToEdit=Düzenlemek için tıklayın ClickToEdit=Düzenlemek için tıklayın
ObjectDeleted=Nesne %s silindi ObjectDeleted=Nesne %s silindi
ByCountry=Ülkeye göre ByCountry=Ülkeye göre
@ -672,12 +673,12 @@ HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" (aksi durumda "%s") adıyla kaydedin SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" (aksi durumda "%s") adıyla kaydedin
OriginFileName=Özgün dosya adı OriginFileName=Özgün dosya adı
SetDemandReason=Kaynağı ayarlayın SetDemandReason=Kaynağı ayarlayın
SetBankAccount=Define Bank Account SetBankAccount=Banka Hesabı Tanımla
AccountCurrency=Account Currency AccountCurrency=Hesap Para Birimi
ViewPrivateNote=Notları izle ViewPrivateNote=Notları izle
XMoreLines=%s gizli satır(lar) XMoreLines=%s gizli satır(lar)
PublicUrl=Genel URL PublicUrl=Genel URL
AddBox=Add box AddBox=Kutu ekle
# Week day # Week day
Monday=Pazartesi Monday=Pazartesi

4
htdocs/langs/tr_TR/orders.lang
View File

@ -94,7 +94,7 @@ ConfirmCancelOrder=Bu siparişi iptal etmek istediğinizden emin misiniz?
ConfirmMakeOrder=Bu siparişi <b>%s</b> üzerine yaptığınızı onaylamak istediğinizden emin misiniz? ConfirmMakeOrder=Bu siparişi <b>%s</b> üzerine yaptığınızı onaylamak istediğinizden emin misiniz?
GenerateBill=Fatura oluştur GenerateBill=Fatura oluştur
ClassifyShipped=Teslim edildi sınıflandır ClassifyShipped=Teslim edildi sınıflandır
ClassifyBilled=Faturalandı sınıflandır ClassifyBilled=Faturalı olarak sınıflandır
ComptaCard=Muhasebe kartı ComptaCard=Muhasebe kartı
DraftOrders=Taslak sipariş DraftOrders=Taslak sipariş
RelatedOrders=İlgili siparişler RelatedOrders=İlgili siparişler
@ -137,7 +137,7 @@ OrderSource1=Internet
OrderSource2=Posta kampanyası OrderSource2=Posta kampanyası
OrderSource3=Telefon kampanyası OrderSource3=Telefon kampanyası
OrderSource4=Faks kampanyası OrderSource4=Faks kampanyası
OrderSource5=Reklam OrderSource5=Ticari
OrderSource6=Mağaza OrderSource6=Mağaza
QtyOrdered=Sipariş miktarı QtyOrdered=Sipariş miktarı
AddDeliveryCostLine=Siparişin ağırlığını belirten bir teslimat satırı ekleyin AddDeliveryCostLine=Siparişin ağırlığını belirten bir teslimat satırı ekleyin

16
htdocs/langs/tr_TR/other.lang
View File

@ -59,12 +59,12 @@ PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayr
PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu olmalı).<br>İki satır enter tuşu ile ayrılmıştır. PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu olmalı).<br>İki satır enter tuşu ile ayrılmıştır.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz buradadır __PROPREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__
DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır. DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır.
ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin... ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
@ -80,6 +80,16 @@ ModifiedBy=%s tarafından düzenlendi
ValidatedBy=%s tarafından onaylandı ValidatedBy=%s tarafından onaylandı
CanceledBy=%s tarafından iptal edildi CanceledBy=%s tarafından iptal edildi
ClosedBy=%s tarafından kapatıldı ClosedBy=%s tarafından kapatıldı
CreatedById=Oluşturanın kullanıcı kimliği
ModifiedById=Son değişikliği yapan kullanıcı kimliği
ValidatedById=Doğrulayanın kullanıcı kimliği
CanceledById=İptal edenin kullanıcı kimliği
ClosedById=Kapatanın kullanıcı kimliği
CreatedByLogin=Oluşturanın kullanıcı adı
ModifiedByLogin=Son değişikliği yapanın kullanıcı adı
ValidatedByLogin=Doğrulayanın kullanıcı adı
CanceledByLogin=İptal edenin kullanıcı adı
ClosedByLogin=Kapatanın kullanıcı adı
FileWasRemoved=%s dosyası kaldırıldı FileWasRemoved=%s dosyası kaldırıldı
DirWasRemoved=%s dizini kaldırıldı DirWasRemoved=%s dizini kaldırıldı
FeatureNotYetAvailableShort=Gelecek sürümde olacaktır FeatureNotYetAvailableShort=Gelecek sürümde olacaktır

10
htdocs/langs/tr_TR/products.lang
View File

@ -80,12 +80,12 @@ ContractStatusClosed=Kapalı
ContractStatusRunning=Yürürlükte ContractStatusRunning=Yürürlükte
ContractStatusExpired=süresi doldu ContractStatusExpired=süresi doldu
ContractStatusOnHold=Yürürlükte değil ContractStatusOnHold=Yürürlükte değil
ContractStatusToRun=To get running ContractStatusToRun=Yürülüğe alınacak
ContractNotRunning=Bu sözleşme çalışmıyor ContractNotRunning=Bu sözleşme çalışmıyor
ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var. ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer. ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu. ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu.
ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. ErrorPriceCantBeLowerThanMinPrice=Hata! Fiyat Enaz Fiyattan düşük olamaz
Suppliers=Tedarikçiler Suppliers=Tedarikçiler
SupplierRef=Tedarikçi ürün ref. SupplierRef=Tedarikçi ürün ref.
ShowProduct=Ürün Göster ShowProduct=Ürün Göster
@ -238,7 +238,7 @@ PriceByCustomer=Müşteri fiyatı
PriceCatalogue=Ürün/Servis için birim fiyat PriceCatalogue=Ürün/Servis için birim fiyat
PricingRule=Fiyatlandırma yetkileri PricingRule=Fiyatlandırma yetkileri
AddCustomerPrice=Müşteriler için fiyat ekle AddCustomerPrice=Müşteriler için fiyat ekle
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
PriceByCustomerLog=Müşteri fiyat günlüğü PriceByCustomerLog=Müşteri fiyat günlüğü
MinimumPriceLimit=Minimum price can't be lower that %s MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
MinimumRecommendedPrice=Minimum recommended price is : %s MinimumRecommendedPrice=Önerilen enaz fiyat: %s

4
htdocs/langs/tr_TR/propal.lang
View File

@ -37,7 +37,7 @@ PropalStatusDraft=Taslak (doğrulanması gerekir)
PropalStatusValidated=Onaylı (teklif açık) PropalStatusValidated=Onaylı (teklif açık)
PropalStatusOpened=Onaylı (teklif açık) PropalStatusOpened=Onaylı (teklif açık)
PropalStatusClosed=Kapalı PropalStatusClosed=Kapalı
PropalStatusSigned=İmzalanmış(faturalanması gerekiyor) PropalStatusSigned=İmzalı(faturalanacak)
PropalStatusNotSigned=İmzalanmamış (kapalı) PropalStatusNotSigned=İmzalanmamış (kapalı)
PropalStatusBilled=Faturalanmış PropalStatusBilled=Faturalanmış
PropalStatusDraftShort=Taslak PropalStatusDraftShort=Taslak
@ -48,7 +48,7 @@ PropalStatusSignedShort=İmzalı
PropalStatusNotSignedShort=İmzalanmamış PropalStatusNotSignedShort=İmzalanmamış
PropalStatusBilledShort=Faturalanmış PropalStatusBilledShort=Faturalanmış
PropalsToClose=Kapatılacak teklifler PropalsToClose=Kapatılacak teklifler
PropalsToBill=Faturalandırılacak imzalı teklifler PropalsToBill=Faturalanacak imzalı teklifler
ListOfProposals=Teklif listesi ListOfProposals=Teklif listesi
ActionsOnPropal=Tekliler için yapılan eylemler ActionsOnPropal=Tekliler için yapılan eylemler
NoOpenedPropals=Açık teklif yok NoOpenedPropals=Açık teklif yok

4
htdocs/langs/tr_TR/salaries.lang
View File

@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users # Dolibarr language file - Source file is en_US - users
SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Ücret ödemeleri muhasebe kodu
SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Mali yükümlülük için muhasebe kodu
Salary=Ücret Salary=Ücret
Salaries=Ücretler Salaries=Ücretler
Employee=Çalışan Employee=Çalışan
@ -6,3 +8,5 @@ NewSalaryPayment=Yeni ücret ödemesi
SalaryPayment=Ücret ödemesi SalaryPayment=Ücret ödemesi
SalariesPayments=Ücret ödemeleri SalariesPayments=Ücret ödemeleri
ShowSalaryPayment=Ücret ödemesi göster ShowSalaryPayment=Ücret ödemesi göster
THM=Ortalama saat ücreti
TJM=Ortalama günlük ücret

2
htdocs/langs/tr_TR/sendings.lang
View File

@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatla
DateDeliveryPlanned=Planlanan teslim tarihi DateDeliveryPlanned=Planlanan teslim tarihi
DateReceived=Teslim alınan tarih DateReceived=Teslim alınan tarih
SendShippingByEMail=Sevkiyatı EPostayla gönder SendShippingByEMail=Sevkiyatı EPostayla gönder
SendShippingRef=%s sevkiyatını gönder SendShippingRef=% Nakliyatının yapılması
ActionsOnShipping=Sevkiyat eylemleri ActionsOnShipping=Sevkiyat eylemleri
LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı
ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır. ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır.

4
htdocs/langs/tr_TR/stocks.lang
View File

@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönder
StockDiffPhysicTeoric=Fiziksel ve teorik stok arasındaki stok farkı StockDiffPhysicTeoric=Fiziksel ve teorik stok arasındaki stok farkı
NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir. NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir.
DispatchVerb=Dağıtım DispatchVerb=Dağıtım
StockLimitShort=Limit for alert StockLimitShort=Uyarı sınırı
StockLimit=Stock limit for alert StockLimit=Stok sınırı uyarısı
PhysicalStock=Fiziksel stok PhysicalStock=Fiziksel stok
RealStock=Gerçek Stok RealStock=Gerçek Stok
VirtualStock=Sanal stok VirtualStock=Sanal stok

2
htdocs/langs/tr_TR/trips.lang
View File

@ -19,4 +19,4 @@ TF_TRIP=Gezi
ListTripsAndExpenses=Geziler ve giderler listesi ListTripsAndExpenses=Geziler ve giderler listesi
ExpensesArea=Geziler ve giderler alanı ExpensesArea=Geziler ve giderler alanı
SearchATripAndExpense=Bir gezi ve gider ara SearchATripAndExpense=Bir gezi ve gider ara
ClassifyRefunded=Classify 'Refunded' ClassifyRefunded=Sınıflandırma 'İade edildi'

7
htdocs/langs/tr_TR/users.lang
View File

@ -15,7 +15,7 @@ AvailableRights=Varolan izinler
OwnedRights=Sahip olunan izinler OwnedRights=Sahip olunan izinler
GroupRights=Grup izinleri GroupRights=Grup izinleri
UserRights=Kullanıcı izinleri UserRights=Kullanıcı izinleri
UserGUISetup=Kullanıcı ekranı kurulumu UserGUISetup=Kullanıcı ekranı ayarları
DisableUser=Engelle DisableUser=Engelle
DisableAUser=Bir kullanıcıyı engelle DisableAUser=Bir kullanıcıyı engelle
DeleteUser=Sil DeleteUser=Sil
@ -87,7 +87,7 @@ MyInformations=Verilerim
ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri
DomainUser=Etki alanı kullanıcısı %s DomainUser=Etki alanı kullanıcısı %s
Reactivate=Yeniden etkinleştir Reactivate=Yeniden etkinleştir
CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. CreateInternalUserDesc=Bu form firmanız/kurumunuz içinde kullanıcı oluşturmanızı sağlar. Dış kullanıcı (müşteri, tedarikçi,...) oluşturmak için üçüncü parti kişi kartlarından 'Dolibarr Kullanıcısı Oluştur' dğmesini kullan.
InternalExternalDesc=Bir <b>iç</b> kullanıcı firmanızın/derneğinizin bir parçasıdır. <br>Bir<b>dış</b> kullanıcı bir müşteri, tedarikçi veya bir başkasıdır.<br><br>Her iki durumda da, izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş->Kurulum->Görünüm’e bakın) InternalExternalDesc=Bir <b>iç</b> kullanıcı firmanızın/derneğinizin bir parçasıdır. <br>Bir<b>dış</b> kullanıcı bir müşteri, tedarikçi veya bir başkasıdır.<br><br>Her iki durumda da, izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş->Kurulum->Görünüm’e bakın)
PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti. PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
Inherited=İntikal eden Inherited=İntikal eden
@ -114,8 +114,9 @@ YourRole=Sizin rolünüz
YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı! YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
NbOfUsers=Kullanıcı sayısı NbOfUsers=Kullanıcı sayısı
DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
HierarchicalResponsible=Sorumlu sıradüzeni HierarchicalResponsible=Yönetici
HierarchicView=Sıradüzeni görünümü HierarchicView=Sıradüzeni görünümü
UseTypeFieldToChange=Değiştirmek için Alan türünü kullan UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
OpenIDURL=OpenID URL OpenIDURL=OpenID URL
LoginUsingOpenID=Giriş için OpenID kullan LoginUsingOpenID=Giriş için OpenID kullan
WeeklyHours=Haftalık saatler

2
htdocs/main.inc.php
View File

@ -1821,7 +1821,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
$ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />'; $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />';
$ret.='<input type="submit" class="button" value="'.$langs->trans("Go").'">'; $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
$ret.="</form>\n"; $ret.="</form>\n";
return $ret; return $ret;
} }

4
htdocs/product/composition/card.php
View File

@ -295,7 +295,7 @@ if ($id > 0 || ! empty($ref))
} }
else else
{ {
print price($object->price).' '.$langs->trans($object->price_base_type); print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
} }
print '</td></tr>'; print '</td></tr>';
@ -307,7 +307,7 @@ if ($id > 0 || ! empty($ref))
} }
else else
{ {
print price($object->price_min).' '.$langs->trans($object->price_base_type); print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
} }
print '</td></tr>'; print '</td></tr>';
} }

4
htdocs/product/stock/replenish.php
View File

@ -51,8 +51,8 @@ $tobuy = GETPOST('tobuy', 'int');
$salert = GETPOST('salert', 'alpha'); $salert = GETPOST('salert', 'alpha');
$mode = GETPOST('mode','alpha'); $mode = GETPOST('mode','alpha');
$fourn_id = GETPOST('mode','int'); // FIXME $fourn_id is not defined $fourn_id = GETPOST('fourn_id','int');
$texte = ''; // FIXME $texte is not defined $texte = '';
$sortfield = GETPOST('sortfield','alpha'); $sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha'); $sortorder = GETPOST('sortorder','alpha');

31
htdocs/societe/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Charles-Fr Benke <charles.fr@benke.fr> * Copyright (C) 2014 Charles-Fr Benke <charles.fr@benke.fr>
* *
@ -64,7 +64,7 @@ print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("Search").'</th></tr>'; print '<th colspan="3">'.$langs->trans("SearchThirdparty").'</th></tr>';
print "<tr ".$bc[false]."><td>"; print "<tr ".$bc[false]."><td>";
print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>'; print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>';
print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'; print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
@ -79,9 +79,26 @@ print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>'; print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>'; //print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '</tr>'; print '</tr>';
print "</table></form><br>"; print "</table></form><br>";
/*
* Search contact
*/
$rowspan=2;
if (! empty($conf->barcode->enabled)) $rowspan++;
print '<form method="post" action="'.DOL_URL_ROOT.'/contact/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("SearchContact").'</th></tr>';
print "<tr ".$bc[false]."><td>";
print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_firstlast_only" id="search_firstlast_only"></td>';
print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="contactname" id="contactname"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '</tr>';
print "</table></form><br>";
/* /*
* Statistics area * Statistics area
@ -121,7 +138,7 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2)) if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2))
{ {
print '<tr><td align="center" colspan="2">'; print '<tr '.$bc[0].'><td align="center" colspan="2">';
$dataseries=array(); $dataseries=array();
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect'])); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer'])); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
@ -135,19 +152,19 @@ else
{ {
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
{ {
$statstring = "<tr $bc[0]>"; $statstring = "<tr ".$bc[0].">";
$statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/list.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>'; $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/list.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
$statstring.= "</tr>"; $statstring.= "</tr>";
} }
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
{ {
$statstring.= "<tr $bc[1]>"; $statstring.= "<tr ".$bc[1].">";
$statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/list.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>'; $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/list.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
$statstring.= "</tr>"; $statstring.= "</tr>";
} }
if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS))
{ {
$statstring2 = "<tr $bc[0]>"; $statstring2 = "<tr ".$bc[0].">";
$statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/list.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>'; $statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/list.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
$statstring2.= "</tr>"; $statstring2.= "</tr>";
} }

2
htdocs/support/default.css
View File

@ -18,7 +18,7 @@
body { body {
font-size:12px; font-size:12px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; background: #f9f9f9;
/* background-color: #F4F4F4; */ /* background-color: #F4F4F4; */
margin: 5px 10px; margin: 5px 10px;
} }

BIN
htdocs/support/dolibarr_logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
htdocs/support/headbg.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
htdocs/theme/amarok/img/object_resource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

BIN
htdocs/theme/auguria/img/object_resource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

Some files were not shown because too many files have changed in this diff Show More