forked from Wavyzz/dolibarr
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
Regis Houssin
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
|
|||||||
***** ChangeLog for 3.2 compared to 3.1 *****
|
***** ChangeLog for 3.2 compared to 3.1 *****
|
||||||
|
|
||||||
For users:
|
For users:
|
||||||
|
- New: Can open back a closed commercial proposal.
|
||||||
- New: show thirdparty barcode on main tab.
|
- New: show thirdparty barcode on main tab.
|
||||||
- New: Can input note (private and public) during note and expenses creation.
|
- New: Can input note (private and public) during note and expenses creation.
|
||||||
- New: Print ticket show invoice ref into POS module.
|
- New: Print ticket show invoice ref into POS module.
|
||||||
|
|||||||
@@ -319,8 +319,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/doc/tshirt`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/doc/tshirt`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`;
|
#$ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
|
||||||
@@ -338,8 +337,8 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/html`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/html`;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||||
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@@ -42,6 +42,7 @@ $mode=GETPOST('mode');
|
|||||||
|
|
||||||
$mesg='';
|
$mesg='';
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
@@ -51,46 +52,8 @@ if ($mode == 'cardlogin' && empty($foruserlogin))
|
|||||||
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Login"));
|
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Login"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg)
|
if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg)
|
||||||
{
|
{
|
||||||
llxHeader('',$langs->trans("MembersCards"));
|
|
||||||
|
|
||||||
print_fiche_titre($langs->trans("LinkToGeneratedPages"));
|
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
print $langs->trans("LinkToGeneratedPagesDesc").'<br>';
|
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
if ($mesg) print '<div class="error">'.$mesg.'</div><br>';
|
|
||||||
|
|
||||||
print $langs->trans("DocForAllMembersCards",($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
|
|
||||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
|
||||||
print '<input type="hidden" name="foruserid" value="all">';
|
|
||||||
print '<input type="hidden" name="mode" value="card">';
|
|
||||||
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
|
||||||
print '</form>';
|
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
print $langs->trans("DocForOneMemberCards",($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
|
|
||||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
|
||||||
print '<input type="hidden" name="mode" value="cardlogin">';
|
|
||||||
print $langs->trans("Login").': <input size="10" type="text" name="foruserlogin" value="">';
|
|
||||||
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
|
||||||
print '</form>';
|
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
print $langs->trans("DocForLabels",$conf->global->ADHERENT_ETIQUETTE_TYPE).' ';
|
|
||||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
|
||||||
print '<input type="hidden" name="mode" value="label">';
|
|
||||||
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
|
||||||
print '</form>';
|
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
llxFooter();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
$arrayofmembers=array();
|
$arrayofmembers=array();
|
||||||
|
|
||||||
// requete en prenant que les adherents a jour de cotisation
|
// requete en prenant que les adherents a jour de cotisation
|
||||||
@@ -192,25 +155,70 @@ else
|
|||||||
// Build and output PDF
|
// Build and output PDF
|
||||||
if (empty($mode) || $mode=='card' || $mode='cardlogin')
|
if (empty($mode) || $mode=='card' || $mode='cardlogin')
|
||||||
{
|
{
|
||||||
$result=members_card_pdf_create($db, $arrayofmembers, '', $outputlangs);
|
if (! count($arrayofmembers))
|
||||||
|
{
|
||||||
|
$mesg=$langs->trans("ErrorRecordNotFound");
|
||||||
}
|
}
|
||||||
if ($mode == 'label')
|
|
||||||
|
if (! $mesg) $result=members_card_pdf_create($db, $arrayofmembers, '', $outputlangs);
|
||||||
|
|
||||||
|
}
|
||||||
|
elseif ($mode == 'label')
|
||||||
{
|
{
|
||||||
$result=members_label_pdf_create($db, $arrayofmembers, '', $outputlangs);
|
$result=members_label_pdf_create($db, $arrayofmembers, '', $outputlangs);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($result <= 0)
|
if ($result <= 0)
|
||||||
{
|
{
|
||||||
dol_print_error($db,$result);
|
dol_print_error('',$result);
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $mesg) exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
llxHeader('',$langs->trans("MembersCards"));
|
||||||
|
|
||||||
|
print_fiche_titre($langs->trans("LinkToGeneratedPages"));
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
|
print $langs->trans("LinkToGeneratedPagesDesc").'<br>';
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
|
dol_htmloutput_errors($mesg);
|
||||||
|
|
||||||
|
print $langs->trans("DocForAllMembersCards",($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
|
||||||
|
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||||
|
print '<input type="hidden" name="foruserid" value="all">';
|
||||||
|
print '<input type="hidden" name="mode" value="card">';
|
||||||
|
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
||||||
|
print '</form>';
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
|
print $langs->trans("DocForOneMemberCards",($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
|
||||||
|
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||||
|
print '<input type="hidden" name="mode" value="cardlogin">';
|
||||||
|
print $langs->trans("Login").': <input size="10" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">';
|
||||||
|
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
||||||
|
print '</form>';
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
|
print $langs->trans("DocForLabels",$conf->global->ADHERENT_ETIQUETTE_TYPE).' ';
|
||||||
|
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
|
||||||
|
print '<input type="hidden" name="mode" value="label">';
|
||||||
|
print ' <input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
|
||||||
|
print '</form>';
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
llxFooter();
|
llxFooter();
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
$db->close();
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ $hookmanager=new HookManager($db);
|
|||||||
$hookmanager->callHooks(array('propalcard'));
|
$hookmanager->callHooks(array('propalcard'));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* Actions */
|
/* Actions */
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
@@ -246,9 +247,7 @@ if ($_POST['action'] == 'set_ref_client' && $user->rights->propale->creer)
|
|||||||
$object->set_ref_client($user, $_POST['ref_client']);
|
$object->set_ref_client($user, $_POST['ref_client']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Create proposal
|
||||||
* Creation propale
|
|
||||||
*/
|
|
||||||
if ($_POST['action'] == 'add' && $user->rights->propale->creer)
|
if ($_POST['action'] == 'add' && $user->rights->propale->creer)
|
||||||
{
|
{
|
||||||
$object->socid=$_POST['socid'];
|
$object->socid=$_POST['socid'];
|
||||||
@@ -382,10 +381,22 @@ if ($action == 'classifybilled')
|
|||||||
$object->cloture($user, 4, '');
|
$object->cloture($user, 4, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Reopen proposal
|
||||||
* Cloture de la propale
|
if ($action == 'confirm_reopen' && $user->rights->propale->cloturer)
|
||||||
*/
|
{
|
||||||
if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
|
if (! $_POST['cancel'])
|
||||||
|
{
|
||||||
|
$object->fetch($id);
|
||||||
|
// prevent browser refresh from reopening proposal several times
|
||||||
|
if ($object->statut==2 || $object->statut==3)
|
||||||
|
{
|
||||||
|
$object->setStatut(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close proposal
|
||||||
|
if ($action == 'setstatut' && $user->rights->propale->cloturer)
|
||||||
{
|
{
|
||||||
if (! $_POST['cancel'])
|
if (! $_POST['cancel'])
|
||||||
{
|
{
|
||||||
@@ -407,7 +418,6 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add file in email form
|
* Add file in email form
|
||||||
*/
|
*/
|
||||||
@@ -1051,17 +1061,19 @@ if ($id > 0 || ! empty($ref))
|
|||||||
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
|
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Confirm delete
|
||||||
* Confirmation de la suppression de la propale
|
|
||||||
*/
|
|
||||||
if ($action == 'delete')
|
if ($action == 'delete')
|
||||||
{
|
{
|
||||||
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp'), 'confirm_delete','',0,1);
|
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Confirm reopen
|
||||||
* Confirmation de la suppression d'une ligne produit/service
|
if ($action == 'reopen')
|
||||||
*/
|
{
|
||||||
|
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Confirmation delete product/service line
|
||||||
if ($action == 'ask_deleteline')
|
if ($action == 'ask_deleteline')
|
||||||
{
|
{
|
||||||
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
|
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
|
||||||
@@ -1569,6 +1581,13 @@ if ($id > 0 || ! empty($ref))
|
|||||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif">'.$langs->trans('Modify').'</a>';
|
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif">'.$langs->trans('Modify').'</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReOpen
|
||||||
|
if (($object->statut == 2 || $object->statut == 3) && $user->rights->propale->cloturer)
|
||||||
|
{
|
||||||
|
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#reopen').'"';
|
||||||
|
print '>'.$langs->trans('ReOpen').'</a>';
|
||||||
|
}
|
||||||
|
|
||||||
// Send
|
// Send
|
||||||
if ($object->statut == 1 || $object->statut == 2)
|
if ($object->statut == 1 || $object->statut == 2)
|
||||||
{
|
{
|
||||||
@@ -1594,9 +1613,9 @@ if ($id > 0 || ! empty($ref))
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create an invoice and classify billed
|
// Create an invoice and classify billed
|
||||||
if ($conf->facture->enabled && $object->statut == 2 && $user->societe_id == 0)
|
if ($object->statut == 2 && $user->societe_id == 0)
|
||||||
{
|
{
|
||||||
if ($user->rights->facture->creer)
|
if ($conf->facture->enabled && $user->rights->facture->creer)
|
||||||
{
|
{
|
||||||
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
|
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,17 +116,17 @@ class Propal extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
* @param DoliDB $DB Database handler
|
* @param DoliDB $db Database handler
|
||||||
* @param int $socid Id third party
|
* @param int $socid Id third party
|
||||||
* @param int $propalid Id proposal
|
* @param int $propalid Id proposal
|
||||||
*/
|
*/
|
||||||
function Propal($DB, $socid="", $propalid=0)
|
function Propal($db, $socid="", $propalid=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
|
|
||||||
$this->db = $DB ;
|
$this->db = $db;
|
||||||
$this->socid = $socid;
|
$this->socid = $socid;
|
||||||
$this->id = $propalid;
|
$this->id = $propalid;
|
||||||
$this->products = array();
|
$this->products = array();
|
||||||
@@ -295,7 +295,7 @@ class Propal extends CommonObject
|
|||||||
* @param double $txlocaltax2 Local tax 2 rate
|
* @param double $txlocaltax2 Local tax 2 rate
|
||||||
* @param int $fk_product Id du produit/service predefini
|
* @param int $fk_product Id du produit/service predefini
|
||||||
* @param double $remise_percent Pourcentage de remise de la ligne
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
* @param double $price_base_type HT or TTC
|
* @param string $price_base_type HT or TTC
|
||||||
* @param dobule $pu_ttc Prix unitaire TTC
|
* @param dobule $pu_ttc Prix unitaire TTC
|
||||||
* @param int $info_bits Bits de type de lignes
|
* @param int $info_bits Bits de type de lignes
|
||||||
* @param int $type Type of line (product, service)
|
* @param int $type Type of line (product, service)
|
||||||
@@ -1464,12 +1464,43 @@ class Propal extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Closure of the commercial proposal
|
* Close the commercial proposal
|
||||||
* @param User $user Object user that closure
|
*
|
||||||
|
* @param User $user Object user that close
|
||||||
* @param int $statut Statut
|
* @param int $statut Statut
|
||||||
* @param text $note Commentaire
|
* @param text $note Comment
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 if KO, >0 if OK
|
||||||
|
*/
|
||||||
|
function reopen($user, $statut, $note)
|
||||||
|
{
|
||||||
|
global $langs,$conf;
|
||||||
|
|
||||||
|
$this->statut = $statut;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
$this->db->begin();
|
||||||
|
|
||||||
|
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
|
||||||
|
$sql.= " SET fk_statut = ".$statut.", note = '".$this->db->escape($note)."', date_cloture=".$this->db->idate(mktime()).", fk_user_cloture=".$user->id;
|
||||||
|
$sql.= " WHERE rowid = ".$this->id;
|
||||||
|
|
||||||
|
$resql=$this->db->query($sql);
|
||||||
|
if ($resql)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close the commercial proposal
|
||||||
|
*
|
||||||
|
* @param User $user Object user that close
|
||||||
|
* @param int $statut Statut
|
||||||
|
* @param text $note Comment
|
||||||
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function cloture($user, $statut, $note)
|
function cloture($user, $statut, $note)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -114,10 +114,11 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoie la reference de commande suivante non utilisee en fonction du module
|
* Returns the reference to the following non used Order depending on the active numbering module
|
||||||
* de numerotation actif defini dans COMMANDE_ADDON
|
* defined into COMMANDE_ADDON
|
||||||
* \param soc objet societe
|
*
|
||||||
* \return string reference libre pour la commande
|
* @param Societe $soc Object thirdparty
|
||||||
|
* @return string Order free reference
|
||||||
*/
|
*/
|
||||||
function getNextNumRef($soc)
|
function getNextNumRef($soc)
|
||||||
{
|
{
|
||||||
@@ -395,7 +396,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Tag the order as validated (opened)
|
* Tag the order as validated (opened)
|
||||||
* Function used when order is reopend after being closed.
|
* Function used when order is reopend after being closed.
|
||||||
* @param user Object user that change status
|
*
|
||||||
|
* @param User $user Object user that change status
|
||||||
* @return int <0 if KO, 0 if nothing is done, >0 if OK
|
* @return int <0 if KO, 0 if nothing is done, >0 if OK
|
||||||
*/
|
*/
|
||||||
function set_reopen($user)
|
function set_reopen($user)
|
||||||
@@ -447,7 +449,7 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Close order
|
* Close order
|
||||||
*
|
*
|
||||||
* @param user Objet user that close
|
* @param User $user Objet user that close
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function cloture($user)
|
function cloture($user)
|
||||||
@@ -579,8 +581,9 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Create order
|
* Create order
|
||||||
* Note that this->ref can be set or empty. If empty, we will use "(PROV)"
|
* Note that this->ref can be set or empty. If empty, we will use "(PROV)"
|
||||||
* @param user Objet user that make creation
|
*
|
||||||
* @param notrigger Disable all triggers
|
* @param User $user Objet user that make creation
|
||||||
|
* @param int notrigger Disable all triggers
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function create($user, $notrigger=0)
|
function create($user, $notrigger=0)
|
||||||
@@ -941,25 +944,28 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an order line into database (linked to product/service or not)
|
* Add an order line into database (linked to product/service or not)
|
||||||
* @param commandeid Id of line
|
*
|
||||||
* @param desc Description of line
|
* @param int $commandeid Id of line
|
||||||
* @param pu_ht Unit price (without tax)
|
* @param string $desc Description of line
|
||||||
* @param qty Quantite
|
* @param double $pu_ht Unit price (without tax)
|
||||||
* @param txtva Taux de tva force, sinon -1
|
* @param double $qty Quantite
|
||||||
* @param txlocaltax1 Local tax 1 rate
|
* @param double $txtva Taux de tva force, sinon -1
|
||||||
* @param txlocaltax2 Local tax 2 rate
|
* @param double $txlocaltax1 Local tax 1 rate
|
||||||
* @param fk_product Id du produit/service predefini
|
* @param double $txlocaltax2 Local tax 2 rate
|
||||||
* @param remise_percent Pourcentage de remise de la ligne
|
* @param int $fk_product Id du produit/service predefini
|
||||||
* @param info_bits Bits de type de lignes
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
* @param fk_remise_except Id remise
|
* @param int $info_bits Bits de type de lignes
|
||||||
* @param price_base_type HT or TTC
|
* @param int $fk_remise_except Id remise
|
||||||
* @param pu_ttc Prix unitaire TTC
|
* @param string $price_base_type HT or TTC
|
||||||
* @param date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
* @param double $pu_ttc Prix unitaire TTC
|
||||||
* @param date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
||||||
* @param type Type of line (0=product, 1=service)
|
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
||||||
* @param rang Position of line
|
* @param int $type Type of line (0=product, 1=service)
|
||||||
|
* @param int $rang Position of line
|
||||||
* @return int >0 if OK, <0 if KO
|
* @return int >0 if OK, <0 if KO
|
||||||
|
*
|
||||||
* @see add_product
|
* @see add_product
|
||||||
|
*
|
||||||
* Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
|
* Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
|
||||||
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
|
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
|
||||||
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
|
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
|
||||||
@@ -1098,13 +1104,15 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Add line into array
|
* Add line into array
|
||||||
* $this->client doit etre charge
|
* $this->client must be loaded
|
||||||
* @param idproduct Id du produit a ajouter
|
*
|
||||||
* @param qty Quantite
|
* @param int $idproduct Product Id
|
||||||
* @param remise_percent Remise relative effectuee sur le produit
|
* @param double $qty Quantity
|
||||||
* @param date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
* @param double $remise_percent Product discount relative
|
||||||
* @param date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
* @param timestamp $date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
||||||
|
* @param timestamp $date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
|
||||||
* @return void
|
* @return void
|
||||||
|
*
|
||||||
* TODO Remplacer les appels a cette fonction par generation objet Ligne
|
* TODO Remplacer les appels a cette fonction par generation objet Ligne
|
||||||
* insere dans tableau $this->products
|
* insere dans tableau $this->products
|
||||||
*/
|
*/
|
||||||
@@ -1175,10 +1183,11 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get object and lines from database
|
* Get object and lines from database
|
||||||
* @param id Id of object to load
|
*
|
||||||
* @param ref Ref of object
|
* @param int $id Id of object to load
|
||||||
* @param ref_ext External reference of object
|
* @param string $ref Ref of object
|
||||||
* @param ref_int Internal reference of other object
|
* @param string $ref_ext External reference of object
|
||||||
|
* @param string $ref_int Internal reference of other object
|
||||||
* @return int >0 if OK, <0 if KO
|
* @return int >0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function fetch($id, $ref='', $ref_ext='', $ref_int='')
|
function fetch($id, $ref='', $ref_ext='', $ref_int='')
|
||||||
@@ -1306,8 +1315,9 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ajout d'une ligne remise fixe dans la commande, en base
|
* Adding line of fixed discount in the order in DB
|
||||||
* @param idremise Id de la remise fixe
|
*
|
||||||
|
* @param int $idremise Id de la remise fixe
|
||||||
* @return int >0 si ok, <0 si ko
|
* @return int >0 si ok, <0 si ko
|
||||||
*/
|
*/
|
||||||
function insert_discount($idremise)
|
function insert_discount($idremise)
|
||||||
@@ -1382,7 +1392,8 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load array lines
|
* Load array lines
|
||||||
* @param only_product Return only physical products
|
*
|
||||||
|
* @param int $only_product Return only physical products
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function fetch_lines($only_product=0)
|
function fetch_lines($only_product=0)
|
||||||
@@ -1468,6 +1479,7 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return number of line with type product.
|
* Return number of line with type product.
|
||||||
|
*
|
||||||
* @return int <0 if KO, Nbr of product lines if OK
|
* @return int <0 if KO, Nbr of product lines if OK
|
||||||
*/
|
*/
|
||||||
function getNbOfProductsLines()
|
function getNbOfProductsLines()
|
||||||
@@ -1482,8 +1494,10 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load array this->expeditions of nb of products sent by line in order
|
* Load array this->expeditions of nb of products sent by line in order
|
||||||
* @param filtre_statut Filter on status
|
*
|
||||||
|
* @param int $filtre_statut Filter on status
|
||||||
* @return int <0 if KO, Nb of lines found if OK
|
* @return int <0 if KO, Nb of lines found if OK
|
||||||
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecated, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function loadExpeditions($filtre_statut=-1)
|
function loadExpeditions($filtre_statut=-1)
|
||||||
@@ -1529,7 +1543,8 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie un tableau avec nombre de lignes d'expeditions
|
* Returns a array with expeditions lines number
|
||||||
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecated, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function nb_expedition()
|
function nb_expedition()
|
||||||
@@ -1551,9 +1566,11 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie un tableau avec les livraisons par ligne
|
* Return a array with sendings by line
|
||||||
* @param filtre_statut Filtre sur statut
|
*
|
||||||
|
* @param int $filtre_statut Filtre sur statut
|
||||||
* @return int 0 si OK, <0 si KO
|
* @return int 0 si OK, <0 si KO
|
||||||
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecated, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function livraison_array($filtre_statut=-1)
|
function livraison_array($filtre_statut=-1)
|
||||||
@@ -1564,9 +1581,11 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie un tableau avec les stocks restant par produit
|
* Return a array with the pending stock by product
|
||||||
* @param filtre_statut Filtre sur statut
|
*
|
||||||
|
* @param int $filtre_statut Filtre sur statut
|
||||||
* @return int 0 si OK, <0 si KO
|
* @return int 0 si OK, <0 si KO
|
||||||
|
*
|
||||||
* TODO FONCTION NON FINIE A FINIR
|
* TODO FONCTION NON FINIE A FINIR
|
||||||
*/
|
*/
|
||||||
function stock_array($filtre_statut=-1)
|
function stock_array($filtre_statut=-1)
|
||||||
@@ -1603,7 +1622,8 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete an order line
|
* Delete an order line
|
||||||
* @param lineid Id of line to delete
|
*
|
||||||
|
* @param int $lineid Id of line to delete
|
||||||
* @return int >0 if OK, 0 if nothing to do, <0 if KO
|
* @return int >0 if OK, 0 if nothing to do, <0 if KO
|
||||||
*/
|
*/
|
||||||
function deleteline($lineid)
|
function deleteline($lineid)
|
||||||
@@ -1749,8 +1769,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set the order date
|
* Set the order date
|
||||||
*
|
*
|
||||||
* @param user Object user making change
|
* @param User $user Object user making change
|
||||||
* @param date Date
|
* @param timestamp $date Date
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function set_date($user, $date)
|
function set_date($user, $date)
|
||||||
@@ -1784,8 +1804,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set the planned delivery date
|
* Set the planned delivery date
|
||||||
*
|
*
|
||||||
* @param user Objet utilisateur qui modifie
|
* @param User $user Objet utilisateur qui modifie
|
||||||
* @param date_livraison Date de livraison
|
* @param timestamp $date_livraison Date de livraison
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 si ko, >0 si ok
|
||||||
*/
|
*/
|
||||||
function set_date_livraison($user, $date_livraison)
|
function set_date_livraison($user, $date_livraison)
|
||||||
@@ -1819,8 +1839,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set address
|
* Set address
|
||||||
*
|
*
|
||||||
* @param user Object user making change
|
* @param User $user Object user making change
|
||||||
* @param fk_address Adress of delivery
|
* @param int $fk_address Adress of delivery
|
||||||
* @return int <0 ig KO, >0 if Ok
|
* @return int <0 ig KO, >0 if Ok
|
||||||
*/
|
*/
|
||||||
function set_adresse_livraison($user, $fk_address)
|
function set_adresse_livraison($user, $fk_address)
|
||||||
@@ -1847,8 +1867,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set availability
|
* Set availability
|
||||||
*
|
*
|
||||||
* @param user Object user making change
|
* @param User $user Object user making change
|
||||||
* @param id If of availability delay
|
* @param int $id If of availability delay
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function set_availability($user, $id)
|
function set_availability($user, $id)
|
||||||
@@ -1876,8 +1896,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set source of demand
|
* Set source of demand
|
||||||
*
|
*
|
||||||
* @param user Object user making change
|
* @param User $user Object user making change
|
||||||
* @param id Id of source
|
* @param int $id Id of source
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function set_demand_reason($user, $id)
|
function set_demand_reason($user, $id)
|
||||||
@@ -1905,8 +1925,8 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Return list of orders (eventuelly filtered on a user) into an array
|
* Return list of orders (eventuelly filtered on a user) into an array
|
||||||
*
|
*
|
||||||
* @param brouillon 0=non brouillon, 1=brouillon
|
* @param int $brouillon 0=non brouillon, 1=brouillon
|
||||||
* @param user Objet user de filtre
|
* @param User $user Objet user de filtre
|
||||||
* @return int -1 if KO, array with result if OK
|
* @return int -1 if KO, array with result if OK
|
||||||
*/
|
*/
|
||||||
function liste_array($brouillon=0, $user='')
|
function liste_array($brouillon=0, $user='')
|
||||||
@@ -1950,7 +1970,7 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Change les conditions de reglement de la commande
|
* Change les conditions de reglement de la commande
|
||||||
*
|
*
|
||||||
* @param cond_reglement_id Id de la nouvelle condition de reglement
|
* @param int $cond_reglement_id Id de la nouvelle condition de reglement
|
||||||
* @return int >0 if OK, <0 if KO
|
* @return int >0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function cond_reglement($cond_reglement_id)
|
function cond_reglement($cond_reglement_id)
|
||||||
@@ -1985,7 +2005,7 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Change le mode de reglement
|
* Change le mode de reglement
|
||||||
*
|
*
|
||||||
* @param mode Id du nouveau mode
|
* @param int $mode Id du nouveau mode
|
||||||
* @return int >0 si ok, <0 si ko
|
* @return int >0 si ok, <0 si ko
|
||||||
*/
|
*/
|
||||||
function mode_reglement($mode_reglement_id)
|
function mode_reglement($mode_reglement_id)
|
||||||
@@ -2018,7 +2038,8 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Change le delai de livraison
|
* Change le delai de livraison
|
||||||
* @param availability_id Id du nouveau mode
|
*
|
||||||
|
* @param int $availability_id Id du nouveau mode
|
||||||
* @return int >0 if OK, <0 if KO
|
* @return int >0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function availability($availability_id)
|
function availability($availability_id)
|
||||||
@@ -2050,9 +2071,10 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Change la source de la demande
|
* Change la source de la demande
|
||||||
* \param mode Id du nouveau mode
|
*
|
||||||
* \return int >0 si ok, <0 si ko
|
* @param int $demand_reason_id Id of new demand
|
||||||
|
* @return int >0 if ok, <0 if ko
|
||||||
*/
|
*/
|
||||||
function demand_reason($demand_reason_id)
|
function demand_reason($demand_reason_id)
|
||||||
{
|
{
|
||||||
@@ -2083,10 +2105,10 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Set customer ref
|
* Set customer ref
|
||||||
* \param user User that make change
|
* @param User $user User that make change
|
||||||
* \param ref_client Customer ref
|
* @param string $ref_client Customer ref
|
||||||
* \return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function set_ref_client($user, $ref_client)
|
function set_ref_client($user, $ref_client)
|
||||||
{
|
{
|
||||||
@@ -2118,8 +2140,9 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Classe la commande comme facturee
|
* Classify the order as invoiced
|
||||||
* \return int <0 si ko, >0 si ok
|
*
|
||||||
|
* @return int <0 if ko, >0 if ok
|
||||||
*/
|
*/
|
||||||
function classer_facturee()
|
function classer_facturee()
|
||||||
{
|
{
|
||||||
@@ -2148,19 +2171,19 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Update a line in database
|
* Update a line in database
|
||||||
*
|
*
|
||||||
* @param rowid Id of line to update
|
* @param int $rowid Id of line to update
|
||||||
* @param desc Description de la ligne
|
* @param string $desc Description de la ligne
|
||||||
* @param pu Prix unitaire
|
* @param double $pu Prix unitaire
|
||||||
* @param qty Quantity
|
* @param double $qty Quantity
|
||||||
* @param remise_percent Pourcentage de remise de la ligne
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
* @param tva_tx Taux TVA
|
* @param double $tva_tx Taux TVA
|
||||||
* @param txlocaltax1 Local tax 1 rate
|
* @param double $txlocaltax1 Local tax 1 rate
|
||||||
* @param txlocaltax2 Local tax 2 rate
|
* @param double $txlocaltax2 Local tax 2 rate
|
||||||
* @param price_base_type HT or TTC
|
* @param string $price_base_type HT or TTC
|
||||||
* @param info_bits Miscellaneous informations on line
|
* @param int $info_bits Miscellaneous informations on line
|
||||||
* @param date_start Start date of the line
|
* @param timestamp $date_start Start date of the line
|
||||||
* @param date_end End date of the line
|
* @param timestamp $date_end End date of the line
|
||||||
* @param type Type of line (0=product, 1=service)
|
* @param int $type Type of line (0=product, 1=service)
|
||||||
* @return int < 0 if KO, > 0 if OK
|
* @return int < 0 if KO, > 0 if OK
|
||||||
*/
|
*/
|
||||||
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0)
|
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0)
|
||||||
@@ -2381,7 +2404,7 @@ class Commande extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||||
*
|
*
|
||||||
* @param user Objet user
|
* @param User $user Object user
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function load_board($user)
|
function load_board($user)
|
||||||
@@ -2423,8 +2446,9 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Return source label of order
|
* Return source label of order
|
||||||
* \return string Label
|
*
|
||||||
|
* @return string Label
|
||||||
*/
|
*/
|
||||||
function getLabelSource()
|
function getLabelSource()
|
||||||
{
|
{
|
||||||
@@ -2437,9 +2461,10 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne le libelle du statut de la commande
|
* Return status label of Order
|
||||||
* \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
*
|
||||||
* \return string Libelle
|
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
||||||
|
* @return string Libelle
|
||||||
*/
|
*/
|
||||||
function getLibStatut($mode)
|
function getLibStatut($mode)
|
||||||
{
|
{
|
||||||
@@ -2447,10 +2472,11 @@ class Commande extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoi le libelle d'un statut donne
|
* Return label of status
|
||||||
* @param statut Id statut
|
*
|
||||||
* @param facturee Si facturee
|
* @param int $statut Id statut
|
||||||
* @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
* @param int $facturee if invoiced
|
||||||
|
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
||||||
* @return string Label of status
|
* @return string Label of status
|
||||||
*/
|
*/
|
||||||
function LibStatut($statut,$facturee,$mode)
|
function LibStatut($statut,$facturee,$mode)
|
||||||
@@ -2516,10 +2542,11 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return clicable link of object (with eventually picto)
|
* Return clicable link of object (with eventually picto)
|
||||||
* @param withpicto Add picto into link
|
*
|
||||||
* @param option Where point the link
|
* @param int $withpicto Add picto into link
|
||||||
* @param max Max length to show
|
* @param int $option Where point the link
|
||||||
* @param short Use short labels
|
* @param int $max Max length to show
|
||||||
|
* @param int $short Use short labels
|
||||||
* @return string String with URL
|
* @return string String with URL
|
||||||
*/
|
*/
|
||||||
function getNomUrl($withpicto=0,$option=0,$max=0,$short=0)
|
function getNomUrl($withpicto=0,$option=0,$max=0,$short=0)
|
||||||
@@ -2547,8 +2574,9 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Charge les informations d'ordre info dans l'objet commande
|
* Charge les informations d'ordre info dans l'objet commande
|
||||||
* \param id Id de la commande a charger
|
*
|
||||||
|
* @param int $id Id of order
|
||||||
*/
|
*/
|
||||||
function info($id)
|
function info($id)
|
||||||
{
|
{
|
||||||
@@ -2728,6 +2756,8 @@ class Commande extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return an array of order lines
|
* Return an array of order lines
|
||||||
|
*
|
||||||
|
* @return array Lines of order
|
||||||
*/
|
*/
|
||||||
function getLinesArray()
|
function getLinesArray()
|
||||||
{
|
{
|
||||||
@@ -2851,7 +2881,7 @@ class OrderLine
|
|||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
* @param DB handler d'acces base de donnee
|
* @param DoliDB $DB handler d'acces base de donnee
|
||||||
*/
|
*/
|
||||||
function OrderLine($DB)
|
function OrderLine($DB)
|
||||||
{
|
{
|
||||||
@@ -2957,7 +2987,7 @@ class OrderLine
|
|||||||
/**
|
/**
|
||||||
* Insert line into database
|
* Insert line into database
|
||||||
*
|
*
|
||||||
* @param notrigger 1 = disable triggers
|
* @param int $notrigger 1 = disable triggers
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function insert($notrigger=0)
|
function insert($notrigger=0)
|
||||||
@@ -3055,8 +3085,9 @@ class OrderLine
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mise a jour de l'objet ligne de commande en base
|
* Update the line object into db
|
||||||
*
|
*
|
||||||
|
* @param int $notrigger 1 = disable triggers
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 si ko, >0 si ok
|
||||||
*/
|
*/
|
||||||
function update($notrigger=0)
|
function update($notrigger=0)
|
||||||
@@ -3137,9 +3168,9 @@ class OrderLine
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mise a jour de l'objet ligne de commande en base
|
* Update totals of order into database
|
||||||
*
|
*
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 if ko, >0 if ok
|
||||||
*/
|
*/
|
||||||
function update_total()
|
function update_total()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,11 +46,10 @@ class CommandeStats extends Stats
|
|||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
* @param $DB Database handler
|
* @param DoliDB $DB Database handler
|
||||||
* @param $socid Id third party for filter
|
* @param int $socid Id third party for filter
|
||||||
* @param $mode Option
|
* @param string $mode Option
|
||||||
* @param $userid Id user for filter
|
* @param int $userid Id user for filter
|
||||||
* @return CommandeStats
|
|
||||||
*/
|
*/
|
||||||
function CommandeStats($DB, $socid=0, $mode, $userid=0)
|
function CommandeStats($DB, $socid=0, $mode, $userid=0)
|
||||||
{
|
{
|
||||||
@@ -88,8 +87,10 @@ class CommandeStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoie le nombre de commande par mois pour une annee donnee
|
* Return orders number by month for a year
|
||||||
*
|
*
|
||||||
|
* @param int $year year for stats
|
||||||
|
* @return array array with number by month
|
||||||
*/
|
*/
|
||||||
function getNbByMonth($year)
|
function getNbByMonth($year)
|
||||||
{
|
{
|
||||||
@@ -108,7 +109,9 @@ class CommandeStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de commande par annee
|
* Return orders number by year
|
||||||
|
*
|
||||||
|
* @return array array with number by year
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function getNbByYear()
|
function getNbByYear()
|
||||||
@@ -127,8 +130,10 @@ class CommandeStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de commande par mois pour une annee donnee
|
* Return the orders amount by month for a year
|
||||||
*
|
*
|
||||||
|
* @param int $year year for stats
|
||||||
|
* @return array array with number by month
|
||||||
*/
|
*/
|
||||||
function getAmountByMonth($year)
|
function getAmountByMonth($year)
|
||||||
{
|
{
|
||||||
@@ -147,8 +152,10 @@ class CommandeStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de commande par mois pour une annee donnee
|
* Return the orders amount average by month for a year
|
||||||
*
|
*
|
||||||
|
* @param int $year year for stats
|
||||||
|
* @return array array with number by month
|
||||||
*/
|
*/
|
||||||
function getAverageByMonth($year)
|
function getAverageByMonth($year)
|
||||||
{
|
{
|
||||||
@@ -166,10 +173,10 @@ class CommandeStats extends Stats
|
|||||||
return $this->_getAverageByMonth($year, $sql);
|
return $this->_getAverageByMonth($year, $sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Return nb, total and average
|
* Return nb, total and average
|
||||||
* \return array Array of values
|
*
|
||||||
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
function getAllByYear()
|
function getAllByYear()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
|
||||||
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@@ -302,8 +302,9 @@ class FactureRec extends Facture
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Recupere les lignes de factures predefinies dans this->lines
|
* Recupere les lignes de factures predefinies dans this->lines
|
||||||
* \return int 1 if OK, < 0 if KO
|
*
|
||||||
|
* @return int 1 if OK, < 0 if KO
|
||||||
*/
|
*/
|
||||||
function fetch_lines()
|
function fetch_lines()
|
||||||
{
|
{
|
||||||
@@ -405,9 +406,24 @@ class FactureRec extends Facture
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
*
|
||||||
* Add a line to invoice
|
* Add a line to invoice
|
||||||
*
|
*
|
||||||
* @return int <0 if KO, >0 if OK
|
* @param int $facid Id de la facture
|
||||||
|
* @param string $desc Description de la ligne
|
||||||
|
* @param double $pu_ht Prix unitaire HT (> 0 even for credit note)
|
||||||
|
* @param double $qty Quantite
|
||||||
|
* @param double $txtva Taux de tva force, sinon -1
|
||||||
|
* @param int $fk_product Id du produit/service predefini
|
||||||
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
|
* @param string $price_base_type HT or TTC
|
||||||
|
* @param int $info_bits Bits de type de lignes
|
||||||
|
* @param int $fk_remise_except Id remise
|
||||||
|
* @param double $pu_ttc Prix unitaire TTC (> 0 even for credit note)
|
||||||
|
* @param int $type Type of line (0=product, 1=service)
|
||||||
|
* @param int $rang Position of line
|
||||||
|
* @param int $special_code
|
||||||
|
* @return int <0 if KO, Id of line if OK
|
||||||
*/
|
*/
|
||||||
function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0)
|
function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0)
|
||||||
{
|
{
|
||||||
@@ -514,9 +530,11 @@ class FactureRec extends Facture
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Rend la facture automatique
|
* Rend la facture automatique
|
||||||
* @param user
|
*
|
||||||
* @param freq
|
* @param User $user
|
||||||
* @param courant
|
* @param int $freq
|
||||||
|
* @param string $courant
|
||||||
|
* @return int 0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function set_auto($user, $freq, $courant)
|
function set_auto($user, $freq, $courant)
|
||||||
{
|
{
|
||||||
@@ -547,10 +565,10 @@ class FactureRec extends Facture
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoie nom clicable (avec eventuellement le picto)
|
* Renvoie nom clicable (avec eventuellement le picto)
|
||||||
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
|
* @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
|
||||||
* \param option Sur quoi pointe le lien ('', 'withdraw')
|
* @param string $option Sur quoi pointe le lien ('', 'withdraw')
|
||||||
* \return string Chaine avec URL
|
* @return string Chaine avec URL
|
||||||
*/
|
*/
|
||||||
function getNomUrl($withpicto=0,$option='')
|
function getNomUrl($withpicto=0,$option='')
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -433,8 +433,8 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Create a new invoice in database from current invoice
|
* Create a new invoice in database from current invoice
|
||||||
*
|
*
|
||||||
* @param user Object user that ask creation
|
* @param User $user Object user that ask creation
|
||||||
* @param invertdetail Reverse sign of amounts for lines
|
* @param int $invertdetail Reverse sign of amounts for lines
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function createFromCurrent($user,$invertdetail=0)
|
function createFromCurrent($user,$invertdetail=0)
|
||||||
@@ -708,10 +708,10 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Get object and lines from database
|
* Get object and lines from database
|
||||||
*
|
*
|
||||||
* @param rowid Id of object to load
|
* @param int $rowid Id of object to load
|
||||||
* @param ref Reference of invoice
|
* @param string $ref Reference of invoice
|
||||||
* @param ref_ext External reference of invoice
|
* @param string $ref_ext External reference of invoice
|
||||||
* @param ref_int Internal reference of other object
|
* @param int $ref_int Internal reference of other object
|
||||||
* @return int >0 if OK, <0 if KO
|
* @return int >0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function fetch($rowid, $ref='', $ref_ext='', $ref_int='')
|
function fetch($rowid, $ref='', $ref_ext='', $ref_int='')
|
||||||
@@ -905,8 +905,8 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Update database
|
* Update database
|
||||||
*
|
*
|
||||||
* @param user User that modify
|
* @param User $user User that modify
|
||||||
* @param notrigger 0=launch triggers after, 1=disable triggers
|
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function update($user=0, $notrigger=0)
|
function update($user=0, $notrigger=0)
|
||||||
@@ -1745,24 +1745,24 @@ class Facture extends CommonObject
|
|||||||
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
|
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
|
||||||
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
|
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
|
||||||
*
|
*
|
||||||
* @param facid Id de la facture
|
* @param int $facid Id de la facture
|
||||||
* @param desc Description de la ligne
|
* @param string $desc Description de la ligne
|
||||||
* @param pu_ht Prix unitaire HT (> 0 even for credit note)
|
* @param double $pu_ht Prix unitaire HT (> 0 even for credit note)
|
||||||
* @param qty Quantite
|
* @param double $qty Quantite
|
||||||
* @param txtva Taux de tva force, sinon -1
|
* @param double $txtva Taux de tva force, sinon -1
|
||||||
* @param txlocaltax1 Local tax 1 rate
|
* @param double $txlocaltax1 Local tax 1 rate
|
||||||
* @param txlocaltax2 Local tax 2 rate
|
* @param double $txlocaltax2 Local tax 2 rate
|
||||||
* @param fk_product Id du produit/service predefini
|
* @param int $fk_product Id du produit/service predefini
|
||||||
* @param remise_percent Pourcentage de remise de la ligne
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
* @param date_start Date de debut de validite du service
|
* @param timestamp $date_start Date de debut de validite du service
|
||||||
* @param date_end Date de fin de validite du service
|
* @param timestamp $date_end Date de fin de validite du service
|
||||||
* @param ventil Code de ventilation comptable
|
* @param int $ventil Code de ventilation comptable
|
||||||
* @param info_bits Bits de type de lignes
|
* @param int $info_bits Bits de type de lignes
|
||||||
* @param fk_remise_except Id remise
|
* @param int $fk_remise_except Id remise
|
||||||
* @param price_base_type HT or TTC
|
* @param string $price_base_type HT or TTC
|
||||||
* @param pu_ttc Prix unitaire TTC (> 0 even for credit note)
|
* @param double $pu_ttc Prix unitaire TTC (> 0 even for credit note)
|
||||||
* @param type Type of line (0=product, 1=service)
|
* @param int $type Type of line (0=product, 1=service)
|
||||||
* @param rang Position of line
|
* @param int $rang Position of line
|
||||||
* @return int <0 if KO, Id of line if OK
|
* @return int <0 if KO, Id of line if OK
|
||||||
*/
|
*/
|
||||||
function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0)
|
function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0)
|
||||||
@@ -1908,21 +1908,22 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Update a detail line
|
* Update a detail line
|
||||||
* @param rowid Id of line to update
|
*
|
||||||
* @param desc Description of line
|
* @param int $rowid Id of line to update
|
||||||
* @param pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines)
|
* @param string $desc Description of line
|
||||||
* @param qty Quantity
|
* @param double $pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines)
|
||||||
* @param remise_percent Pourcentage de remise de la ligne
|
* @param double $qty Quantity
|
||||||
* @param date_start Date de debut de validite du service
|
* @param double $remise_percent Pourcentage de remise de la ligne
|
||||||
* @param date_end Date de fin de validite du service
|
* @param date $date_start Date de debut de validite du service
|
||||||
* @param tva_tx VAT Rate
|
* @param date $date_end Date de fin de validite du service
|
||||||
* @param txlocaltax1 Local tax 1 rate
|
* @param double $tva_tx VAT Rate
|
||||||
* @param txlocaltax2 Local tax 2 rate
|
* @param double $txlocaltax1 Local tax 1 rate
|
||||||
* @param price_base_type HT or TTC
|
* @param double $txlocaltax2 Local tax 2 rate
|
||||||
* @param info_bits Miscellanous informations
|
* @param string $price_base_type HT or TTC
|
||||||
* @param type Type of line (0=product, 1=service)
|
* @param int $info_bits Miscellanous informations
|
||||||
* @param fk_parent_line ???
|
* @param int $type Type of line (0=product, 1=service)
|
||||||
* @param skip_update_total ???
|
* @param int $fk_parent_line ???
|
||||||
|
* @param int $skip_update_total ???
|
||||||
* @return int < 0 if KO, > 0 if OK
|
* @return int < 0 if KO, > 0 if OK
|
||||||
*/
|
*/
|
||||||
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0)
|
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0)
|
||||||
@@ -2037,7 +2038,8 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete line in database
|
* Delete line in database
|
||||||
* @param rowid Id of line to delete
|
*
|
||||||
|
* @param int $rowid Id of line to delete
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function deleteline($rowid)
|
function deleteline($rowid)
|
||||||
@@ -2099,10 +2101,11 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Applique une remise relative
|
* Set percent discount
|
||||||
* \param user User qui positionne la remise
|
*
|
||||||
* \param remise
|
* @param User $user User that set discount
|
||||||
* \return int <0 si ko, >0 si ok
|
* @param double $remise Discount
|
||||||
|
* @return int <0 if ko, >0 if ok
|
||||||
*/
|
*/
|
||||||
function set_remise($user, $remise)
|
function set_remise($user, $remise)
|
||||||
{
|
{
|
||||||
@@ -2134,10 +2137,11 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Applique une remise absolue
|
* Set absolute discount
|
||||||
* \param user User qui positionne la remise
|
*
|
||||||
* \param remise
|
* @param User $user User that set discount
|
||||||
* \return int <0 si ko, >0 si ok
|
* @param double $remise
|
||||||
|
* @return int <0 si ko, >0 si ok
|
||||||
*/
|
*/
|
||||||
function set_remise_absolue($user, $remise)
|
function set_remise_absolue($user, $remise)
|
||||||
{
|
{
|
||||||
@@ -2206,7 +2210,8 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Return list of payments
|
* Return list of payments
|
||||||
*
|
*
|
||||||
* @return Array with list of payments
|
* @param string $filtertype
|
||||||
|
* @return array Array with list of payments
|
||||||
*/
|
*/
|
||||||
function getListOfPayments($filtertype='')
|
function getListOfPayments($filtertype='')
|
||||||
{
|
{
|
||||||
@@ -2257,6 +2262,7 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return amount (with tax) of all credit notes and deposits invoices used by invoice
|
* Return amount (with tax) of all credit notes and deposits invoices used by invoice
|
||||||
|
*
|
||||||
* @return int <0 if KO, Sum of credit notes and deposits amount otherwise
|
* @return int <0 if KO, Sum of credit notes and deposits amount otherwise
|
||||||
*/
|
*/
|
||||||
function getSumCreditNotesUsed()
|
function getSumCreditNotesUsed()
|
||||||
@@ -2278,6 +2284,7 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return amount (with tax) of all deposits invoices used by invoice
|
* Return amount (with tax) of all deposits invoices used by invoice
|
||||||
|
*
|
||||||
* @return int <0 if KO, Sum of deposits amount otherwise
|
* @return int <0 if KO, Sum of deposits amount otherwise
|
||||||
*/
|
*/
|
||||||
function getSumDepositsUsed()
|
function getSumDepositsUsed()
|
||||||
@@ -2298,8 +2305,9 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoie tableau des ids de facture avoir issus de la facture
|
* Renvoie tableau des ids de facture avoir issus de la facture
|
||||||
* \return array Tableau d'id de factures avoirs
|
*
|
||||||
|
* @return array Tableau d'id de factures avoirs
|
||||||
*/
|
*/
|
||||||
function getListIdAvoirFromInvoice()
|
function getListIdAvoirFromInvoice()
|
||||||
{
|
{
|
||||||
@@ -2329,8 +2337,8 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoie l'id de la facture qui la remplace
|
* Renvoie l'id de la facture qui la remplace
|
||||||
* \param option filtre sur statut ('', 'validated', ...)
|
* @param string $option filtre sur statut ('', 'validated', ...)
|
||||||
* \return int <0 si KO, 0 si aucune facture ne remplace, id facture sinon
|
* \return int <0 si KO, 0 si aucune facture ne remplace, id facture sinon
|
||||||
*/
|
*/
|
||||||
function getIdReplacingInvoice($option='')
|
function getIdReplacingInvoice($option='')
|
||||||
@@ -2369,8 +2377,9 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne le libelle du type de facture
|
* Retourne le libelle du type de facture
|
||||||
* \return string Libelle
|
*
|
||||||
|
* @return string Libelle
|
||||||
*/
|
*/
|
||||||
function getLibType()
|
function getLibType()
|
||||||
{
|
{
|
||||||
@@ -2386,8 +2395,8 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return label of object status
|
* Return label of object status
|
||||||
* @param mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
|
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
|
||||||
* @param alreadypaid 0=No payment already done, 1=Some payments already done
|
* @param int $alreadypaid 0=No payment already done, 1=Some payments already done
|
||||||
* @return string Label
|
* @return string Label
|
||||||
*/
|
*/
|
||||||
function getLibStatut($mode=0,$alreadypaid=-1)
|
function getLibStatut($mode=0,$alreadypaid=-1)
|
||||||
@@ -2396,13 +2405,14 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoi le libelle d'un statut donne
|
* Renvoi le libelle d'un statut donne
|
||||||
* \param paye Etat paye
|
*
|
||||||
* \param statut Id statut
|
* @param int $paye Etat paye
|
||||||
* \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
* @param int $statut Id statut
|
||||||
* \param alreadypaid Montant deja paye
|
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
||||||
* \param type Type facture
|
* @param double $alreadypaid Montant deja paye
|
||||||
* \return string Libelle du statut
|
* @param int $type Type facture
|
||||||
|
* @return string Libelle du statut
|
||||||
*/
|
*/
|
||||||
function LibStatut($paye,$statut,$mode=0,$alreadypaid=-1,$type=0)
|
function LibStatut($paye,$statut,$mode=0,$alreadypaid=-1,$type=0)
|
||||||
{
|
{
|
||||||
@@ -2522,8 +2532,9 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Return next reference of invoice not already used (or last reference)
|
* Return next reference of invoice not already used (or last reference)
|
||||||
* according to numbering module defined into constant FACTURE_ADDON
|
* according to numbering module defined into constant FACTURE_ADDON
|
||||||
* @param soc objet company
|
*
|
||||||
* @param mode 'next' for next value or 'last' for last value
|
* @param Society $soc object company
|
||||||
|
* @param string $mode 'next' for next value or 'last' for last value
|
||||||
* @return string free ref or last ref
|
* @return string free ref or last ref
|
||||||
*/
|
*/
|
||||||
function getNextNumRef($soc,$mode='next')
|
function getNextNumRef($soc,$mode='next')
|
||||||
@@ -2586,8 +2597,8 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Charge les informations de l'onglet info dans l'objet facture
|
* Charge les informations de l'onglet info dans l'objet facture
|
||||||
* \param id Id de la facture a charger
|
* @param int $id Id de la facture a charger
|
||||||
*/
|
*/
|
||||||
function info($id)
|
function info($id)
|
||||||
{
|
{
|
||||||
@@ -2630,8 +2641,8 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Change les conditions de reglement de la facture
|
* Change les conditions de reglement de la facture
|
||||||
*
|
*
|
||||||
* @param cond_reglement_id Id de la nouvelle condition de reglement
|
* @param int $cond_reglement_id Id de la nouvelle condition de reglement
|
||||||
* @param date Date to force payment term
|
* @param date $date Date to force payment term
|
||||||
* @return int >0 si ok, <0 si ko
|
* @return int >0 si ok, <0 si ko
|
||||||
*/
|
*/
|
||||||
function cond_reglement($cond_reglement_id,$date='')
|
function cond_reglement($cond_reglement_id,$date='')
|
||||||
@@ -2678,9 +2689,10 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Change le mode de reglement
|
* Change le mode de reglement
|
||||||
* \param mode Id du nouveau mode
|
*
|
||||||
* \return int >0 si ok, <0 si ko
|
* @param int $mode Id du nouveau mode
|
||||||
|
* @return int >0 si ok, <0 si ko
|
||||||
*/
|
*/
|
||||||
function mode_reglement($mode_reglement_id)
|
function mode_reglement($mode_reglement_id)
|
||||||
{
|
{
|
||||||
@@ -2712,9 +2724,9 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoi si les lignes de facture sont ventilees et/ou exportees en compta
|
* Renvoi si les lignes de facture sont ventilees et/ou exportees en compta
|
||||||
* \param user Utilisateur creant la demande
|
*
|
||||||
* \return int <0 if KO, 0=no, 1=yes
|
* @return int <0 if KO, 0=no, 1=yes
|
||||||
*/
|
*/
|
||||||
function getVentilExportCompta()
|
function getVentilExportCompta()
|
||||||
{
|
{
|
||||||
@@ -2746,6 +2758,7 @@ class Facture extends CommonObject
|
|||||||
* If hidden option FACTURE_CAN_BE_REMOVED is on, we can
|
* If hidden option FACTURE_CAN_BE_REMOVED is on, we can
|
||||||
* If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
|
* If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
|
||||||
* If invoice is draft and ha a temporary ref -> yes
|
* If invoice is draft and ha a temporary ref -> yes
|
||||||
|
*
|
||||||
* @return int <0 if KO, 0=no, 1=yes
|
* @return int <0 if KO, 0=no, 1=yes
|
||||||
*/
|
*/
|
||||||
function is_erasable()
|
function is_erasable()
|
||||||
@@ -2778,10 +2791,11 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoi liste des factures remplacables
|
* Renvoi liste des factures remplacables
|
||||||
* Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
|
* Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
|
||||||
* \param socid Id societe
|
*
|
||||||
* \return array Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
|
* @param int $socid Id societe
|
||||||
|
* @return array Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
|
||||||
*/
|
*/
|
||||||
function list_replacable_invoices($socid=0)
|
function list_replacable_invoices($socid=0)
|
||||||
{
|
{
|
||||||
@@ -2825,11 +2839,12 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Renvoi liste des factures qualifiables pour correction par avoir
|
* Renvoi liste des factures qualifiables pour correction par avoir
|
||||||
* Les factures qui respectent les regles suivantes sont retournees:
|
* Les factures qui respectent les regles suivantes sont retournees:
|
||||||
* (validee + paiement en cours) ou classee (payee completement ou payee partiellement) + pas deja remplacee + pas deja avoir
|
* (validee + paiement en cours) ou classee (payee completement ou payee partiellement) + pas deja remplacee + pas deja avoir
|
||||||
* \param socid Id societe
|
*
|
||||||
* \return array Tableau des factures ($id => $ref)
|
* @param int $socid Id societe
|
||||||
|
* @return array Tableau des factures ($id => $ref)
|
||||||
*/
|
*/
|
||||||
function list_qualified_avoir_invoices($socid=0)
|
function list_qualified_avoir_invoices($socid=0)
|
||||||
{
|
{
|
||||||
@@ -2880,9 +2895,10 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Create a withdrawal request for a standing order
|
* Create a withdrawal request for a standing order
|
||||||
* \param user User asking standing order
|
*
|
||||||
* \return int <0 if KO, >0 if OK
|
* @param User $user User asking standing order
|
||||||
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function demande_prelevement($user)
|
function demande_prelevement($user)
|
||||||
{
|
{
|
||||||
@@ -2948,8 +2964,9 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Supprime une demande de prelevement
|
* Supprime une demande de prelevement
|
||||||
* @param user utilisateur creant la demande
|
*
|
||||||
* @param did id de la demande a supprimer
|
* @param User $user utilisateur creant la demande
|
||||||
|
* @param int $did id de la demande a supprimer
|
||||||
*/
|
*/
|
||||||
function demande_prelevement_delete($user, $did)
|
function demande_prelevement_delete($user, $did)
|
||||||
{
|
{
|
||||||
@@ -2970,7 +2987,8 @@ class Facture extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||||
* @param user Objet user
|
*
|
||||||
|
* @param User $user Object user
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function load_board($user)
|
function load_board($user)
|
||||||
@@ -3017,8 +3035,9 @@ class Facture extends CommonObject
|
|||||||
/* gestion des contacts d'une facture */
|
/* gestion des contacts d'une facture */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne id des contacts clients de facturation
|
* Retourne id des contacts clients de facturation
|
||||||
* \return array Liste des id contacts facturation
|
*
|
||||||
|
* @return array Liste des id contacts facturation
|
||||||
*/
|
*/
|
||||||
function getIdBillingContact()
|
function getIdBillingContact()
|
||||||
{
|
{
|
||||||
@@ -3026,8 +3045,9 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne id des contacts clients de livraison
|
* Retourne id des contacts clients de livraison
|
||||||
* \return array Liste des id contacts livraison
|
*
|
||||||
|
* @return array Liste des id contacts livraison
|
||||||
*/
|
*/
|
||||||
function getIdShippingContact()
|
function getIdShippingContact()
|
||||||
{
|
{
|
||||||
@@ -3161,7 +3181,6 @@ class Facture extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
|
||||||
*
|
*
|
||||||
* @param user Objet user
|
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function load_state_board()
|
function load_state_board()
|
||||||
@@ -3201,7 +3220,9 @@ class Facture extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return an array of invoice lines
|
* Create an array of invoice lines
|
||||||
|
*
|
||||||
|
* @return int >0 if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
function getLinesArray()
|
function getLinesArray()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ class FactureStats extends Stats
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de facture par annee
|
* Renvoie le nombre de facture par annee
|
||||||
|
*
|
||||||
* @return array Array of values
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
function getNbByYear()
|
function getNbByYear()
|
||||||
@@ -101,7 +102,8 @@ class FactureStats extends Stats
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de facture par mois pour une annee donnee
|
* Renvoie le nombre de facture par mois pour une annee donnee
|
||||||
* @param year Year to scan
|
*
|
||||||
|
* @param int $year Year to scan
|
||||||
* @return array Array of values
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
function getNbByMonth($year)
|
function getNbByMonth($year)
|
||||||
@@ -121,6 +123,7 @@ class FactureStats extends Stats
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le montant de facture par mois pour une annee donnee
|
* Renvoie le montant de facture par mois pour une annee donnee
|
||||||
|
*
|
||||||
* @param year Year to scan
|
* @param year Year to scan
|
||||||
* @return array Array of values
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
@@ -139,9 +142,10 @@ class FactureStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Return average amount
|
* Return average amount
|
||||||
* \param year Year to scan
|
*
|
||||||
* \return array Array of values
|
* @param int $year Year to scan
|
||||||
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
function getAverageByMonth($year)
|
function getAverageByMonth($year)
|
||||||
{
|
{
|
||||||
@@ -156,8 +160,9 @@ class FactureStats extends Stats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Return nb, total and average
|
* Return nb, total and average
|
||||||
* \return array Array of values
|
*
|
||||||
|
* @return array Array of values
|
||||||
*/
|
*/
|
||||||
function getAllByYear()
|
function getAllByYear()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -286,14 +286,15 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s
|
|||||||
/**
|
/**
|
||||||
* Create a thumbnail from an image file (Supported extensions are gif, jpg, png and bmp).
|
* Create a thumbnail from an image file (Supported extensions are gif, jpg, png and bmp).
|
||||||
* If file is myfile.jpg, new file may be myfile_small.jpg
|
* If file is myfile.jpg, new file may be myfile_small.jpg
|
||||||
* @param file Path of source file to resize
|
*
|
||||||
* @param maxWidth Largeur maximum que dois faire la miniature (-1=unchanged, 160 by default)
|
* @param string $file Path of source file to resize
|
||||||
* @param maxHeight Hauteur maximum que dois faire l'image (-1=unchanged, 120 by default)
|
* @param int $maxWidth Largeur maximum que dois faire la miniature (-1=unchanged, 160 by default)
|
||||||
* @param extName Extension to differenciate thumb file name ('_small', '_mini')
|
* @param int $maxHeight Hauteur maximum que dois faire l'image (-1=unchanged, 120 by default)
|
||||||
* @param quality Quality of compression (0=worst, 100=best)
|
* @param string $extName Extension to differenciate thumb file name ('_small', '_mini')
|
||||||
* @param outdir Directory where to store thumb
|
* @param int $quality Quality of compression (0=worst, 100=best)
|
||||||
* @param targetformat New format of target (1,2,3,4 or 0 to keep old format)
|
* @param string $outdir Directory where to store thumb
|
||||||
* @return string Full path of thumb
|
* @param int $targetformat New format of target (1,2,3,... or 0 to keep old format)
|
||||||
|
* @return string Full path of thumb or '' if it fails
|
||||||
*/
|
*/
|
||||||
function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
|
function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
|
||||||
{
|
{
|
||||||
@@ -355,16 +356,19 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
|
|||||||
$imgfonction='';
|
$imgfonction='';
|
||||||
switch($infoImg[2])
|
switch($infoImg[2])
|
||||||
{
|
{
|
||||||
case 1: // IMG_GIF
|
case IMAGETYPE_GIF: // 1
|
||||||
$imgfonction = 'imagecreatefromgif';
|
$imgfonction = 'imagecreatefromgif';
|
||||||
break;
|
break;
|
||||||
case 2: // IMG_JPG
|
case IMAGETYPE_JPEG: // 2
|
||||||
$imgfonction = 'imagecreatefromjpeg';
|
$imgfonction = 'imagecreatefromjpeg';
|
||||||
break;
|
break;
|
||||||
case 3: // IMG_PNG
|
case IMAGETYPE_PNG: // 3
|
||||||
$imgfonction = 'imagecreatefrompng';
|
$imgfonction = 'imagecreatefrompng';
|
||||||
break;
|
break;
|
||||||
case 4: // IMG_WBMP
|
case IMAGETYPE_BMP: // 6
|
||||||
|
// Not supported by PHP GD
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_WBMP: // 15
|
||||||
$imgfonction = 'imagecreatefromwbmp';
|
$imgfonction = 'imagecreatefromwbmp';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -384,23 +388,32 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
|
|||||||
// Initialisation des variables selon l'extension de l'image
|
// Initialisation des variables selon l'extension de l'image
|
||||||
switch($infoImg[2])
|
switch($infoImg[2])
|
||||||
{
|
{
|
||||||
case 1: // Gif
|
case IMAGETYPE_GIF: // 1
|
||||||
$img = imagecreatefromgif($fichier);
|
$img = imagecreatefromgif($fichier);
|
||||||
$extImg = '.gif'; // Extension de l'image
|
$extImg = '.gif'; // Extension de l'image
|
||||||
break;
|
break;
|
||||||
case 2: // Jpg
|
case IMAGETYPE_JPEG: // 2
|
||||||
$img = imagecreatefromjpeg($fichier);
|
$img = imagecreatefromjpeg($fichier);
|
||||||
$extImg = '.jpg'; // Extension de l'image
|
$extImg = '.jpg'; // Extension de l'image
|
||||||
break;
|
break;
|
||||||
case 3: // Png
|
case IMAGETYPE_PNG: // 3
|
||||||
$img = imagecreatefrompng($fichier);
|
$img = imagecreatefrompng($fichier);
|
||||||
$extImg = '.png';
|
$extImg = '.png';
|
||||||
break;
|
break;
|
||||||
case 4: // Bmp
|
case IMAGETYPE_BMP: // 6
|
||||||
|
// Not supported by PHP GD
|
||||||
|
$extImg = '.bmp';
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_WBMP: // 15
|
||||||
$img = imagecreatefromwbmp($fichier);
|
$img = imagecreatefromwbmp($fichier);
|
||||||
$extImg = '.bmp';
|
$extImg = '.bmp';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (! is_resource($img))
|
||||||
|
{
|
||||||
|
dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Initialisation des dimensions de la vignette si elles sont superieures a l'original
|
// Initialisation des dimensions de la vignette si elles sont superieures a l'original
|
||||||
if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
|
if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
|
||||||
@@ -426,7 +439,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
|
|||||||
if (empty($targetformat)) $targetformat=$infoImg[2];
|
if (empty($targetformat)) $targetformat=$infoImg[2];
|
||||||
|
|
||||||
// Create empty image
|
// Create empty image
|
||||||
if ($targetformat == 1)
|
if ($targetformat == IMAGETYPE_GIF)
|
||||||
{
|
{
|
||||||
// Compatibilite image GIF
|
// Compatibilite image GIF
|
||||||
$imgThumb = imagecreate($thumbWidth, $thumbHeight);
|
$imgThumb = imagecreate($thumbWidth, $thumbHeight);
|
||||||
@@ -451,25 +464,30 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
|
|||||||
// Initialisation des variables selon l'extension de l'image
|
// Initialisation des variables selon l'extension de l'image
|
||||||
switch($targetformat)
|
switch($targetformat)
|
||||||
{
|
{
|
||||||
case 1: // Gif
|
case IMAGETYPE_GIF: // 1
|
||||||
$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
|
$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
|
||||||
imagecolortransparent($imgThumb,$trans_colour);
|
imagecolortransparent($imgThumb,$trans_colour);
|
||||||
$extImgTarget = '.gif';
|
$extImgTarget = '.gif';
|
||||||
$newquality='NU';
|
$newquality='NU';
|
||||||
break;
|
break;
|
||||||
case 2: // Jpg
|
case IMAGETYPE_JPEG: // 2
|
||||||
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
|
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
|
||||||
$extImgTarget = '.jpg';
|
$extImgTarget = '.jpg';
|
||||||
$newquality=$quality;
|
$newquality=$quality;
|
||||||
break;
|
break;
|
||||||
case 3: // Png
|
case IMAGETYPE_PNG: // 3
|
||||||
imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
|
imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
|
||||||
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
|
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
|
||||||
$extImgTarget = '.png';
|
$extImgTarget = '.png';
|
||||||
$newquality=$quality-100;
|
$newquality=$quality-100;
|
||||||
$newquality=round(abs($quality-100)*9/100);
|
$newquality=round(abs($quality-100)*9/100);
|
||||||
break;
|
break;
|
||||||
case 4: // Bmp
|
case IMAGETYPE_BMP: // 6
|
||||||
|
// Not supported by PHP GD
|
||||||
|
$extImgTarget = '.bmp';
|
||||||
|
$newquality='NU';
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_WBMP: // 15
|
||||||
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
|
$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
|
||||||
$extImgTarget = '.bmp';
|
$extImgTarget = '.bmp';
|
||||||
$newquality='NU';
|
$newquality='NU';
|
||||||
@@ -492,16 +510,19 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
|
|||||||
// Create image on disk
|
// Create image on disk
|
||||||
switch($targetformat)
|
switch($targetformat)
|
||||||
{
|
{
|
||||||
case 1: // Gif
|
case IMAGETYPE_GIF: // 1
|
||||||
imagegif($imgThumb, $imgThumbName);
|
imagegif($imgThumb, $imgThumbName);
|
||||||
break;
|
break;
|
||||||
case 2: // Jpg
|
case IMAGETYPE_JPEG: // 2
|
||||||
imagejpeg($imgThumb, $imgThumbName, $newquality);
|
imagejpeg($imgThumb, $imgThumbName, $newquality);
|
||||||
break;
|
break;
|
||||||
case 3: // Png
|
case IMAGETYPE_PNG: // 3
|
||||||
imagepng($imgThumb, $imgThumbName, $newquality);
|
imagepng($imgThumb, $imgThumbName, $newquality);
|
||||||
break;
|
break;
|
||||||
case 4: // Bmp
|
case IMAGETYPE_BMP: // 6
|
||||||
|
// Not supported by PHP GD
|
||||||
|
break;
|
||||||
|
case IMAGETYPE_WBMP: // 15
|
||||||
image2wmp($imgThumb, $imgThumbName);
|
image2wmp($imgThumb, $imgThumbName);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -275,8 +275,11 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Create a expedition line
|
||||||
*
|
*
|
||||||
*
|
* @param int $entrepot_id Id of warehouse
|
||||||
|
* @param int $origin_line_id Id of source line
|
||||||
|
* @param int $qty Quantity
|
||||||
*/
|
*/
|
||||||
function create_line($entrepot_id, $origin_line_id, $qty)
|
function create_line($entrepot_id, $origin_line_id, $qty)
|
||||||
{
|
{
|
||||||
@@ -617,8 +620,11 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ajoute une ligne
|
* Add a expedition line
|
||||||
*
|
*
|
||||||
|
* @param int $entrepot_id Id of warehouse
|
||||||
|
* @param int $id Id of source line
|
||||||
|
* @param int $qty Quantity
|
||||||
*/
|
*/
|
||||||
function addline( $entrepot_id, $id, $qty )
|
function addline( $entrepot_id, $id, $qty )
|
||||||
{
|
{
|
||||||
@@ -633,8 +639,10 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Delete line
|
||||||
*
|
*
|
||||||
*
|
* @param int $lineid Id line of order
|
||||||
|
* TODO Voir si cette function est utilisee
|
||||||
*/
|
*/
|
||||||
function deleteline($lineid)
|
function deleteline($lineid)
|
||||||
{
|
{
|
||||||
@@ -763,7 +771,7 @@ class Expedition extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Delete shipping
|
* Delete shipping
|
||||||
*
|
*
|
||||||
* @return void
|
* @return int >0 if OK otherwise if KO
|
||||||
*/
|
*/
|
||||||
function delete()
|
function delete()
|
||||||
{
|
{
|
||||||
@@ -851,7 +859,7 @@ class Expedition extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Load lines
|
* Load lines
|
||||||
*
|
*
|
||||||
* @return void
|
* @return int >0 if OK, Otherwise if KO
|
||||||
*/
|
*/
|
||||||
function fetch_lines()
|
function fetch_lines()
|
||||||
{
|
{
|
||||||
@@ -910,10 +918,13 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie nom clicable (avec eventuellement le picto)
|
* Return clicable link of object (with eventually picto)
|
||||||
*
|
*
|
||||||
* @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
|
* @param int $withpicto Add picto into link
|
||||||
* @return string Chaine avec URL
|
* @param int $option Where point the link
|
||||||
|
* @param int $max Max length to show
|
||||||
|
* @param int $short Use short labels
|
||||||
|
* @return string String with URL
|
||||||
*/
|
*/
|
||||||
function getNomUrl($withpicto=0,$option=0,$max=0,$short=0)
|
function getNomUrl($withpicto=0,$option=0,$max=0,$short=0)
|
||||||
{
|
{
|
||||||
@@ -938,8 +949,9 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retourne le libelle du statut d'une expedition
|
* Return status label
|
||||||
*
|
*
|
||||||
|
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
|
||||||
* @return string Libelle
|
* @return string Libelle
|
||||||
*/
|
*/
|
||||||
function getLibStatut($mode=0)
|
function getLibStatut($mode=0)
|
||||||
@@ -1064,8 +1076,8 @@ class Expedition extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Set the planned delivery date
|
* Set the planned delivery date
|
||||||
*
|
*
|
||||||
* @param user Objet utilisateur qui modifie
|
* @param User $user Objet utilisateur qui modifie
|
||||||
* @param date_livraison Date de livraison
|
* @param timestamp date_livraison Date de livraison
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 si ko, >0 si ok
|
||||||
*/
|
*/
|
||||||
function set_date_livraison($user, $date_livraison)
|
function set_date_livraison($user, $date_livraison)
|
||||||
@@ -1123,9 +1135,10 @@ class Expedition extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
*
|
||||||
* Get tracking url status
|
* Get tracking url status
|
||||||
*
|
*
|
||||||
* @return void
|
* @param string $value
|
||||||
*/
|
*/
|
||||||
function GetUrlTrackingStatus($value='')
|
function GetUrlTrackingStatus($value='')
|
||||||
{
|
{
|
||||||
@@ -1194,7 +1207,11 @@ class ExpeditionLigne
|
|||||||
var $product_desc; // Description produit
|
var $product_desc; // Description produit
|
||||||
var $ref;
|
var $ref;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param DoliDB $db Database handler
|
||||||
|
*/
|
||||||
function ExpeditionLigne($DB)
|
function ExpeditionLigne($DB)
|
||||||
{
|
{
|
||||||
$this->db=$DB;
|
$this->db=$DB;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||||
|
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@@ -41,9 +42,9 @@ class ExpeditionStats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de expedition par annee
|
* Return expedition number by year
|
||||||
*
|
*
|
||||||
* @return void
|
* @return array array with number by year
|
||||||
*/
|
*/
|
||||||
function getNbExpeditionByYear()
|
function getNbExpeditionByYear()
|
||||||
{
|
{
|
||||||
@@ -74,10 +75,10 @@ class ExpeditionStats
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renvoie le nombre de expedition par mois pour une annee donnee
|
* Return the expeditions number by month for a year
|
||||||
*
|
*
|
||||||
* @param int $year Year
|
* @param int $year Year
|
||||||
* @return int
|
* @return array Array with number by month
|
||||||
*/
|
*/
|
||||||
function getNbExpeditionByMonth($year)
|
function getNbExpeditionByMonth($year)
|
||||||
{
|
{
|
||||||
@@ -122,9 +123,10 @@ class ExpeditionStats
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Return the expeditions number by month for a year
|
||||||
*
|
*
|
||||||
* @param int $year Year
|
* @param int $year Year
|
||||||
* @return int
|
* @return array Array with number by month
|
||||||
*/
|
*/
|
||||||
function getNbExpeditionByMonthWithPrevYear($year)
|
function getNbExpeditionByMonthWithPrevYear($year)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ CreateEmptyPropal=Create empty commercial proposals vierge or from list of produ
|
|||||||
DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
|
DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
|
||||||
UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
|
UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
|
||||||
ClonePropal=Clone commercial proposal
|
ClonePropal=Clone commercial proposal
|
||||||
ConfirmClonePropal=Are you sure you want to clone this commercial proposal <b>%s</b> ?
|
ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
|
||||||
|
ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
|
||||||
ProposalsAndProposalsLines=Commercial proposal and lines
|
ProposalsAndProposalsLines=Commercial proposal and lines
|
||||||
ProposalLine=Proposal line
|
ProposalLine=Proposal line
|
||||||
AvailabilityPeriod=Availability delay
|
AvailabilityPeriod=Availability delay
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ CreateEmptyPropal=Créer proposition/devis vierge
|
|||||||
DefaultProposalDurationValidity=Délai de validité par défaut (en jours)
|
DefaultProposalDurationValidity=Délai de validité par défaut (en jours)
|
||||||
UseCustomerContactAsPropalRecipientIfExist=Utiliser adresse contact suivi client si défini plutôt que adresse tiers comme destinataire des propositions
|
UseCustomerContactAsPropalRecipientIfExist=Utiliser adresse contact suivi client si défini plutôt que adresse tiers comme destinataire des propositions
|
||||||
ClonePropal=Cloner proposition commerciale
|
ClonePropal=Cloner proposition commerciale
|
||||||
ConfirmClonePropal=Êtes-vous sûr de vouloir cloner cette proposition commerciale <b>%s</b> ?
|
ConfirmClonePropal=Êtes-vous sûr de vouloir cloner la proposition commerciale <b>%s</b> ?
|
||||||
|
ConfirmReOpenProp=Êtes-vous sûr de vouloir réouvrir la proposition commerciale <b>%s</b> ?
|
||||||
ProposalsAndProposalsLines=Propositions commerciales clientes et lignes de propositions
|
ProposalsAndProposalsLines=Propositions commerciales clientes et lignes de propositions
|
||||||
ProposalLine=Ligne de proposition
|
ProposalLine=Ligne de proposition
|
||||||
AvailabilityPeriod=Délai de livraison
|
AvailabilityPeriod=Délai de livraison
|
||||||
|
|||||||
@@ -781,6 +781,7 @@ UserMailRequired=电子邮件要求创建一个新用户
|
|||||||
CompanySetup=公司模块设置
|
CompanySetup=公司模块设置
|
||||||
CompanyCodeChecker=对第三方代码生成和检查（客户或供应商模块）
|
CompanyCodeChecker=对第三方代码生成和检查（客户或供应商模块）
|
||||||
AccountCodeManager=代码生成的会计（模块客户或供应商）
|
AccountCodeManager=代码生成的会计（模块客户或供应商）
|
||||||
|
ModuleCompanyCodeAquarium=返回一个会计代码“401代码由第三方供应商的供应商遵循会计守则”和“411”由第三方客户代码之后为客户建立会计代码。
|
||||||
ModuleCompanyCodePanicum=返回一个空的会计代码。
|
ModuleCompanyCodePanicum=返回一个空的会计代码。
|
||||||
ModuleCompanyCodeDigitaria=会计代码依赖于第三方的代码。该代码是字符组成的“C”的第一个位置的前5第三方代码字符之后。
|
ModuleCompanyCodeDigitaria=会计代码依赖于第三方的代码。该代码是字符组成的“C”的第一个位置的前5第三方代码字符之后。
|
||||||
UseNotifications=使用通知
|
UseNotifications=使用通知
|
||||||
|
|||||||
@@ -130,8 +130,8 @@ ErrorDiscountAlreadyUsed=错误，已经使用优惠
|
|||||||
ErrorInvoiceAvoirMustBeNegative=错误的，正确的发票必须有一个负数
|
ErrorInvoiceAvoirMustBeNegative=错误的，正确的发票必须有一个负数
|
||||||
ErrorInvoiceOfThisTypeMustBePositive=错误，这种类型的发票必须有一个正数
|
ErrorInvoiceOfThisTypeMustBePositive=错误，这种类型的发票必须有一个正数
|
||||||
ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已经被另一个发票仍处于草案状态取代发票
|
ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已经被另一个发票仍处于草案状态取代发票
|
||||||
BillFrom=从
|
BillFrom=From
|
||||||
BillTo=条例草案
|
BillTo=Bill To
|
||||||
ActionsOnBill=行动对发票
|
ActionsOnBill=行动对发票
|
||||||
NewBill=新发票
|
NewBill=新发票
|
||||||
Prélèvements=长期订单
|
Prélèvements=长期订单
|
||||||
@@ -184,7 +184,7 @@ File=文件
|
|||||||
AlreadyPaid=已支付
|
AlreadyPaid=已支付
|
||||||
AlreadyPaidNoCreditNotesNoDeposits=已支付（无信用票据及存款）
|
AlreadyPaidNoCreditNotesNoDeposits=已支付（无信用票据及存款）
|
||||||
Abandoned=弃
|
Abandoned=弃
|
||||||
RemainderToPay=其余部分支付
|
RemainderToPay=未支付
|
||||||
RemainderToTake=其余部分采取
|
RemainderToTake=其余部分采取
|
||||||
AmountExpected=索赔额
|
AmountExpected=索赔额
|
||||||
ExcessReceived=收到过剩
|
ExcessReceived=收到过剩
|
||||||
@@ -317,8 +317,8 @@ BankAccountNumberKey=关键
|
|||||||
Residence=Domiciliation
|
Residence=Domiciliation
|
||||||
IBANNumber=IBAN号码
|
IBANNumber=IBAN号码
|
||||||
IBAN=银行IBAN
|
IBAN=银行IBAN
|
||||||
BIC=的BIC / SWIFT的
|
BIC=BIC号码 / SWIFT号码
|
||||||
BICNumber=的BIC / SWIFT的号码
|
BICNumber=BIC号码 / SWIFT号码
|
||||||
ExtraInfos=额外的新闻电台
|
ExtraInfos=额外的新闻电台
|
||||||
RegulatedOn=规范了
|
RegulatedOn=规范了
|
||||||
ChequeNumber=检查ñ °
|
ChequeNumber=检查ñ °
|
||||||
@@ -334,8 +334,8 @@ IntracommunityVATNumber=社区内数增值税
|
|||||||
PaymentByChequeOrderedTo=支票付款是支付到％s发送到
|
PaymentByChequeOrderedTo=支票付款是支付到％s发送到
|
||||||
PaymentByChequeOrderedToShort=支票付款，须付予
|
PaymentByChequeOrderedToShort=支票付款，须付予
|
||||||
SendTo=发送到
|
SendTo=发送到
|
||||||
PaymentByTransferOnThisBankAccount=通过转移支付对下列银行帐户
|
PaymentByTransferOnThisBankAccount=付款至以下帐户
|
||||||
VATIsNotUsedForInvoice=*不适用增值税艺术293B的CGI
|
VATIsNotUsedForInvoice=* 不得包含VAT, 详见CGI-293B
|
||||||
LawApplicationPart1=通过对应用的12/05/80法80.335
|
LawApplicationPart1=通过对应用的12/05/80法80.335
|
||||||
LawApplicationPart2=货物仍然是财产
|
LawApplicationPart2=货物仍然是财产
|
||||||
LawApplicationPart3=卖方直到完全兑现
|
LawApplicationPart3=卖方直到完全兑现
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ LastContacts=最后接触
|
|||||||
MyContacts=我的联系人
|
MyContacts=我的联系人
|
||||||
Phones=电话
|
Phones=电话
|
||||||
Capital=资本
|
Capital=资本
|
||||||
CapitalOf=％s首都
|
CapitalOf=资本 %s
|
||||||
EditCompany=编辑公司
|
EditCompany=编辑公司
|
||||||
EditDeliveryAddress=修改送货地址
|
EditDeliveryAddress=修改送货地址
|
||||||
ThisUserIsNot=这个用户是不是一个前景，客户也不供应商
|
ThisUserIsNot=这个用户是不是一个前景，客户也不供应商
|
||||||
|
|||||||
@@ -267,7 +267,7 @@ UnitPrice=单价
|
|||||||
UnitPriceHT=单位价格（净值）
|
UnitPriceHT=单位价格（净值）
|
||||||
UnitPriceTTC=单价
|
UnitPriceTTC=单价
|
||||||
PriceU=向上
|
PriceU=向上
|
||||||
PriceUHT=向上（净额）
|
PriceUHT=不含税价格
|
||||||
PriceUTTC=向上
|
PriceUTTC=向上
|
||||||
Amount=额
|
Amount=额
|
||||||
AmountInvoice=发票金额
|
AmountInvoice=发票金额
|
||||||
@@ -290,10 +290,10 @@ Total=总
|
|||||||
SubTotal=小计
|
SubTotal=小计
|
||||||
TotalHTShort=共计（净额）
|
TotalHTShort=共计（净额）
|
||||||
TotalTTCShort=共有（包括税）
|
TotalTTCShort=共有（包括税）
|
||||||
TotalHT=共计（税后）
|
TotalHT=共计（不含税）
|
||||||
TotalTTC=共有（包括税）
|
TotalTTC=共计（含税）
|
||||||
TotalTTCToYourCredit=共有（包括税），以你的信用
|
TotalTTCToYourCredit=共有（包括税），以你的信用
|
||||||
TotalVAT=共有增值税
|
TotalVAT=增值税额
|
||||||
IncludedVAT=含增值税
|
IncludedVAT=含增值税
|
||||||
HT=扣除税
|
HT=扣除税
|
||||||
TTC=公司增值税
|
TTC=公司增值税
|
||||||
@@ -308,7 +308,7 @@ List=表
|
|||||||
FullList=全部列表
|
FullList=全部列表
|
||||||
Statistics=统计
|
Statistics=统计
|
||||||
Status=地位
|
Status=地位
|
||||||
Ref=号。
|
Ref=号码
|
||||||
RefSupplier=号。供应商
|
RefSupplier=号。供应商
|
||||||
RefPayment=号。付款
|
RefPayment=号。付款
|
||||||
CommercialProposals=商业建议
|
CommercialProposals=商业建议
|
||||||
@@ -348,12 +348,12 @@ Popularity=声望
|
|||||||
Categories=分类
|
Categories=分类
|
||||||
Category=类别
|
Category=类别
|
||||||
By=由
|
By=由
|
||||||
From=从
|
From=From
|
||||||
to=至
|
to=至
|
||||||
and=和
|
and=和
|
||||||
or=或
|
or=或
|
||||||
Other=其他
|
Other=其他
|
||||||
Others=他人
|
Others=其他
|
||||||
OtherInformations=其它信息
|
OtherInformations=其它信息
|
||||||
Quantity=数量
|
Quantity=数量
|
||||||
Qty=数量
|
Qty=数量
|
||||||
@@ -373,7 +373,7 @@ Unknown=未知
|
|||||||
General=一般
|
General=一般
|
||||||
Size=大小
|
Size=大小
|
||||||
Received=收稿
|
Received=收稿
|
||||||
Paid=支付
|
Paid=已支付
|
||||||
Topic=Sujet
|
Topic=Sujet
|
||||||
ByCompanies=由第三方
|
ByCompanies=由第三方
|
||||||
ByUsers=通过用户
|
ByUsers=通过用户
|
||||||
@@ -407,9 +407,9 @@ November=十一月
|
|||||||
December=十二月
|
December=十二月
|
||||||
Month01=一月
|
Month01=一月
|
||||||
Month02=二月
|
Month02=二月
|
||||||
Month03=游行
|
Month03=三月
|
||||||
Month04=四月
|
Month04=四月
|
||||||
Month05=可能
|
Month05=五月
|
||||||
Month06=六月
|
Month06=六月
|
||||||
Month07=七月
|
Month07=七月
|
||||||
Month08=八月
|
Month08=八月
|
||||||
@@ -419,16 +419,16 @@ Month11=十一月
|
|||||||
Month12=十二月
|
Month12=十二月
|
||||||
MonthShort01=一月
|
MonthShort01=一月
|
||||||
MonthShort02=二月
|
MonthShort02=二月
|
||||||
MonthShort03=马尔
|
MonthShort03=三月
|
||||||
MonthShort04=4月
|
MonthShort04=四月
|
||||||
MonthShort05=可能
|
MonthShort05=五月
|
||||||
MonthShort06=6月
|
MonthShort06=六月
|
||||||
MonthShort07=7月
|
MonthShort07=七月
|
||||||
MonthShort08=8月
|
MonthShort08=八月
|
||||||
MonthShort09=9月
|
MonthShort09=九月
|
||||||
MonthShort10=10月
|
MonthShort10=十月
|
||||||
MonthShort11=11月
|
MonthShort11=十一月
|
||||||
MonthShort12=12月
|
MonthShort12=十二月
|
||||||
AttachedFiles=附加档案和文件
|
AttachedFiles=附加档案和文件
|
||||||
FileTransferComplete=文件被上传successfuly
|
FileTransferComplete=文件被上传successfuly
|
||||||
DateFormatYYYYMM=为YYYY - MM
|
DateFormatYYYYMM=为YYYY - MM
|
||||||
@@ -438,7 +438,7 @@ ReportName=报告名称
|
|||||||
ReportPeriod=报告期内
|
ReportPeriod=报告期内
|
||||||
ReportDescription=描述
|
ReportDescription=描述
|
||||||
Report=报告
|
Report=报告
|
||||||
Keyword=摩托罗拉第一百
|
Keyword=关键字
|
||||||
Legend=传说
|
Legend=传说
|
||||||
FillTownFromZip=从拉链填写城市
|
FillTownFromZip=从拉链填写城市
|
||||||
ShowLog=显示日志
|
ShowLog=显示日志
|
||||||
@@ -446,7 +446,7 @@ File=文件
|
|||||||
Files=档
|
Files=档
|
||||||
NotAllowed=不允许
|
NotAllowed=不允许
|
||||||
ReadPermissionNotAllowed=读取权限不允许
|
ReadPermissionNotAllowed=读取权限不允许
|
||||||
AmountInCurrency=在％数额的货币
|
AmountInCurrency=金额 %s
|
||||||
Example=例子
|
Example=例子
|
||||||
Examples=范例
|
Examples=范例
|
||||||
NoExample=没有例子
|
NoExample=没有例子
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ CHARSET=UTF-8
|
|||||||
OrdersArea=客户订单面积
|
OrdersArea=客户订单面积
|
||||||
SuppliersOrdersArea=供应商的订单面积
|
SuppliersOrdersArea=供应商的订单面积
|
||||||
OrderCard=订购卡
|
OrderCard=订购卡
|
||||||
Order=秩序
|
Order=订单
|
||||||
Orders=订单
|
Orders=订单
|
||||||
OrderLine=在线订单
|
OrderLine=在线订单
|
||||||
OrderFollow=跟进
|
OrderFollow=跟进
|
||||||
@@ -97,7 +97,7 @@ ComptaCard=会计证
|
|||||||
DraftOrders=命令草案
|
DraftOrders=命令草案
|
||||||
RelatedOrders=有关命令
|
RelatedOrders=有关命令
|
||||||
OnProcessOrders=在处理订单
|
OnProcessOrders=在处理订单
|
||||||
RefOrder=号。秩序
|
RefOrder=订单号码
|
||||||
RefCustomerOrder=号。客户订单
|
RefCustomerOrder=号。客户订单
|
||||||
CustomerOrder=客户订单
|
CustomerOrder=客户订单
|
||||||
RefCustomerOrderShort=号。卡斯特。秩序
|
RefCustomerOrderShort=号。卡斯特。秩序
|
||||||
|
|||||||
@@ -8,6 +8,22 @@
|
|||||||
// START - Lines generated via autotranslator.php tool (2010-06-09 00:32:00).
|
// START - Lines generated via autotranslator.php tool (2010-06-09 00:32:00).
|
||||||
// Reference language: en_US
|
// Reference language: en_US
|
||||||
CHARSET=UTF-8
|
CHARSET=UTF-8
|
||||||
|
ErrorPasswordDiffers=密码不同，请重新输入。
|
||||||
|
ErrorForbidden=访问被拒绝。 <br>您尝试访问的页面，无一被验证的会话区或功能，或者不允许你的用户。
|
||||||
|
ErrorForbidden2=此登录权限可以定义你的Dolibarr从菜单％的S ->％s的管理员
|
||||||
|
ErrorForbidden3=看来Dolibarr是不是通过身份验证的会话中使用。以在Dolibarr安装文件就会知道如何管理认证（htaccess的，mod_auth或其他...).
|
||||||
|
ErrorNoImagickReadimage=功能imagick_readimage是没有发现在这个PHP。没有预览可用。管理员可以从菜单中禁用此设置 - 显示选项卡。
|
||||||
|
ErrorRecordAlreadyExists=记录已存在
|
||||||
|
ErrorCantReadFile=无法读取档案'％s'
|
||||||
|
ErrorCantReadDir=无法读取目录'％s'
|
||||||
|
ErrorFailedToFindEntity=无法读取实体'％s'的
|
||||||
|
ErrorBadLoginPassword=坏值的帐号和密码
|
||||||
|
ErrorLoginDisabled=您的帐户已被禁用
|
||||||
|
ErrorFailedToRunExternalCommand=无法运行外部命令。检查它是可用和可运行在PHP的服务器。如果PHP <b>安全模式</b>被激活，请检查命令<b>safe_mode_exec_dir之</b>内，是由参数定义一个目录。
|
||||||
|
ErrorFailedToChangePassword=无法更改密码
|
||||||
|
ErrorLoginDoesNotExists=<b>如何正确</b>使用手机与登录<b>％</b>找不到。
|
||||||
|
ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。
|
||||||
|
ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
|
||||||
SecurityCode=安全代码
|
SecurityCode=安全代码
|
||||||
Calendar=日历
|
Calendar=日历
|
||||||
AddTrip=添加行程
|
AddTrip=添加行程
|
||||||
@@ -17,12 +33,12 @@ BirthdayDate=生日
|
|||||||
DateToBirth=在出生日期
|
DateToBirth=在出生日期
|
||||||
BirthdayAlertOn=生日提醒活跃
|
BirthdayAlertOn=生日提醒活跃
|
||||||
BirthdayAlertOff=生日提醒无效
|
BirthdayAlertOff=生日提醒无效
|
||||||
Notify_FICHINTER_VALIDATE=验证干预
|
Notify_NOTIFY_VAL_FICHINTER=验证干预
|
||||||
Notify_BILL_VALIDATE=客户发票验证
|
Notify_NOTIFY_VAL_FAC=客户发票验证
|
||||||
Notify_ORDER_SUPPLIER_APPROVE=供应商的订单批准
|
Notify_NOTIFY_APP_ORDER_SUPPLIER=供应商的订单批准
|
||||||
Notify_ORDER_SUPPLIER_REFUSE=供应商的订单拒绝
|
Notify_NOTIFY_REF_ORDER_SUPPLIER=供应商的订单拒绝
|
||||||
Notify_ORDER_VALIDATE=验证客户订单
|
Notify_NOTIFY_VAL_ORDER=验证客户订单
|
||||||
Notify_PROPAL_VALIDATE=验证客户的建议
|
Notify_NOTIFY_VAL_PROPAL=验证客户的建议
|
||||||
NbOfAttachedFiles=所附文件数/文件
|
NbOfAttachedFiles=所附文件数/文件
|
||||||
TotalSizeOfAttachedFiles=所附文件的总大小/文件
|
TotalSizeOfAttachedFiles=所附文件的总大小/文件
|
||||||
MaxSize=最大尺寸
|
MaxSize=最大尺寸
|
||||||
@@ -30,8 +46,14 @@ AttachANewFile=附加一个新的文件/文件
|
|||||||
LinkedObject=链接对象
|
LinkedObject=链接对象
|
||||||
Miscellanous=杂项
|
Miscellanous=杂项
|
||||||
NbOfActiveNotifications=号码的通知
|
NbOfActiveNotifications=号码的通知
|
||||||
|
WarningInstallDirExists=警告，安装目录<b>（htdocs中/安装</b> ）依然存在。这是一个严重的安全漏洞。您应该删除它尽快。
|
||||||
|
WarningUntilDirRemoved=所有安全警告（可见由管理员用户只）将保持活跃，只要是存在的脆弱性（或常数MAIN_REMOVE_INSTALL_WARNING是在安装程序->其他设置添加）。
|
||||||
PredefinedMailTest=这是一个测试邮件。\ n该两行是由一个回车分隔。
|
PredefinedMailTest=这是一个测试邮件。\ n该两行是由一个回车分隔。
|
||||||
PredefinedMailTestHtml=这是一个<b>测试</b>邮件（单词测试必须大胆）。 <br>这两条线隔开，回车。
|
PredefinedMailTestHtml=这是一个<b>测试</b>邮件（单词测试必须大胆）。 <br>这两条线隔开，回车。
|
||||||
|
PredefinedMailContentSendInvoice=Veuillez trouver慈联合报制作__FACREF__ \ ñ \ nCordialement \ ñ \ ñ
|
||||||
|
PredefinedMailContentSendInvoiceReminder=努斯apportons à votre明知地阙拉制作__FACREF__东北桑布勒考绩avoir埃泰réglée。香格里拉voici donc，倒入垂降，恩一块jointe。\ ñ \ nCordialement \ ñ \ ñ
|
||||||
|
PredefinedMailContentSendProposal=Veuillez trouver慈联合报主张商业设备__PROPREF__ \ ñ \ nCordialement \ ñ \ ñ
|
||||||
|
PredefinedMailContentSendOrder=Veuillez trouver慈联合报commande __ORDERREF__ \ ñ \ nCordialement \ ñ \ ñ
|
||||||
DemoDesc=Dolibarr是紧凑型的ERP / CRM的几个功能模块组成。一个演示，其中包括所有模块并不意味着什么，因为这永远不会发生。因此，一些演示配置文件都可用。
|
DemoDesc=Dolibarr是紧凑型的ERP / CRM的几个功能模块组成。一个演示，其中包括所有模块并不意味着什么，因为这永远不会发生。因此，一些演示配置文件都可用。
|
||||||
ChooseYourDemoProfil=演示材选择符合您的活动...
|
ChooseYourDemoProfil=演示材选择符合您的活动...
|
||||||
DemoFundation=一个基金会管理成员
|
DemoFundation=一个基金会管理成员
|
||||||
@@ -167,228 +189,8 @@ NoExportableData=没有出口的数据（导出加载的数据，或丢失的权
|
|||||||
ToExport=出口
|
ToExport=出口
|
||||||
NewExport=新的出口
|
NewExport=新的出口
|
||||||
ExternalSites=外部网站
|
ExternalSites=外部网站
|
||||||
// STOP - Lines generated via autotranslator.php tool (2010-06-09 00:32:00).
|
|
||||||
|
|
||||||
|
|
||||||
// START - Lines generated via autotranslator.php tool (2010-07-17 12:23:40).
|
|
||||||
// Reference language: en_US
|
|
||||||
BirthdayAlertOn=bursdag varsling aktive
|
|
||||||
BirthdayAlertOff=bursdag varsling inaktive
|
|
||||||
Notify_ORDER_SUPPLIER_APPROVE=Leverandør bestill godkjent
|
|
||||||
Notify_ORDER_SUPPLIER_REFUSE=Leverandør bestill nektet
|
|
||||||
Notify_ORDER_VALIDATE=Kundeordre validert
|
|
||||||
Notify_PROPAL_VALIDATE=Kunden forslaget validert
|
|
||||||
PredefinedMailTest=Dette er en test post. \ NDe to linjer er atskilt med en vognretur.
|
|
||||||
PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fet skrift). <br> De to linjene er skilt med en vognretur.
|
|
||||||
FeatureNotYetAvailableShort=Tilgjengelig i en neste versjon
|
|
||||||
CalculatedWeight=Beregnet vekt
|
|
||||||
CalculatedVolume=Beregnet volum
|
|
||||||
Length=Lengde
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=cm
|
|
||||||
LengthUnitmm=mm
|
|
||||||
Surface=Område
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=DM2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
StatsByNumberOfUnits=Statistikk i antall produkter / tjenester enheter
|
|
||||||
StatsByNumberOfEntities=Statistikk i antall henvisende enheter
|
|
||||||
NumberOfProposals=Antall forslag på 12 siste måned
|
|
||||||
NumberOfCustomerOrders=Antall kundeordre på siste 12 mnd
|
|
||||||
NumberOfCustomerInvoices=Antall kundefakturaer på siste 12 mnd
|
|
||||||
NumberOfSupplierInvoices=Antall leverandørfakturaer på siste 12 mnd
|
|
||||||
NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
|
|
||||||
NumberOfUnitsCustomerOrders=Antall enheter på kundeordrer på siste 12 mnd
|
|
||||||
NumberOfUnitsCustomerInvoices=Antall enheter på kundenes fakturaer på siste 12 mnd
|
|
||||||
NumberOfUnitsSupplierInvoices=Antall enheter på leverandørfakturaer på siste 12 mnd
|
|
||||||
EMailTextInterventionValidated=Intervensjonen %s har blitt validert.
|
|
||||||
EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
|
|
||||||
EMailTextProposalValidated=Forslaget %s har blitt validert.
|
|
||||||
EMailTextOrderValidated=Ordren %s har blitt validert.
|
|
||||||
EMailTextOrderApproved=Ordren %s er godkjent.
|
|
||||||
EMailTextOrderApprovedBy=Ordren %s er godkjent av %s.
|
|
||||||
EMailTextOrderRefused=Ordren %s har blitt nektet.
|
|
||||||
EMailTextOrderRefusedBy=Ordren %s har blitt nektet av %s.
|
|
||||||
ImportedWithSet=Innførsel datasett
|
|
||||||
DolibarrNotification=Automatisk varsling
|
|
||||||
ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
|
|
||||||
NewLength=Ny bredde
|
|
||||||
NewHeight=Ny høyde
|
|
||||||
NewSizeAfterCropping=Ny størrelse etter beskjæring
|
|
||||||
DefineNewAreaToPick=Definer nytt område på bildet for å plukke (venstre klikk på bildet og dra til du kommer til motsatt hjørne)
|
|
||||||
CurrentInformationOnImage=Informasjon om gjeldende bilde
|
|
||||||
YouReceiveMailBecauseOfNotification=Du mottar denne meldingen fordi din e-post har blitt lagt til listen over mål for å bli informert om spesielle hendelser i %s programvare av %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Denne hendelsen er følgende:
|
|
||||||
ExternalSites=Eksterne nettsteder
|
|
||||||
Notify_ORDER_VALIDATE=Bestelling van de klant gevalideerd
|
|
||||||
Notify_PROPAL_VALIDATE=Klant voorstel gevalideerd
|
|
||||||
PredefinedMailTest=Dit is een test e-mail. \ NDe twee lijnen worden gescheiden door een harde return.
|
|
||||||
PredefinedMailTestHtml=Dit is een <b>test</b> e-mail (het woord test moet worden in het vet). <br> De twee lijnen worden gescheiden door een harde return.
|
|
||||||
CalculatedWeight=Berekend gewicht
|
|
||||||
CalculatedVolume=Berekende volume
|
|
||||||
Length=Lengte
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=cm
|
|
||||||
LengthUnitmm=mm
|
|
||||||
Surface=Gebied
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=dm2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
EMailTextProposalValidated=Het voorstel is gevalideerd %s.
|
|
||||||
EMailTextOrderValidated=De volgorde %s is gevalideerd.
|
|
||||||
ResizeDesc=Voer een nieuwe breedte <b>of</b> hoogte van nieuwe. Ratio zullen worden gehouden gedurende resizen ...
|
|
||||||
NewLength=Nieuwe breedte
|
|
||||||
NewHeight=Nieuwe hoogte
|
|
||||||
NewSizeAfterCropping=Nieuwe grootte na bijsnijden
|
|
||||||
DefineNewAreaToPick=Definieer nieuwe ruimte op de afbeelding om uit te kiezen (klik links op de afbeelding en sleep totdat u bij de tegenoverliggende hoek)
|
|
||||||
CurrentInformationOnImage=Informatie over de huidige afbeelding
|
|
||||||
YouReceiveMailBecauseOfNotification=U ontvangt dit bericht omdat uw e-mail is toegevoegd aan de lijst van doelstellingen te worden geïnformeerd over bepaalde gebeurtenissen in de software van %s %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Dit evenement is de volgende:
|
|
||||||
ExternalSites=Externe sites
|
|
||||||
CalculatedWeight=Berekend gewicht
|
|
||||||
CalculatedVolume=Berekende volume
|
|
||||||
YouReceiveMailBecauseOfNotification=U ontvangt dit bericht omdat uw e-mail is toegevoegd aan de lijst van doelstellingen te worden geïnformeerd over bepaalde gebeurtenissen in de software van %s %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Dit evenement is de volgende:
|
|
||||||
Notify_ORDER_VALIDATE=Aby Klient zatwierdzone
|
|
||||||
Notify_PROPAL_VALIDATE=wniosek Klienta zatwierdzone
|
|
||||||
PredefinedMailTest=To jest test mail. Czeka na zatwierdzenie nowego dwie linie oddzielone są znakiem powrotu karetki.
|
|
||||||
PredefinedMailTestHtml=To jest mail <b>do badań</b> (test słowa muszą być pogrubione). <br> Dwie linie oddzielone są znakiem powrotu karetki.
|
|
||||||
CalculatedWeight=Oblicza masy
|
|
||||||
CalculatedVolume=Objętości
|
|
||||||
Length=Długość
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=cm
|
|
||||||
LengthUnitmm=mm
|
|
||||||
Surface=Obszar
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=dm2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
NumberOfUnitsProposals=Liczba jednostek na propozycje dotyczące ostatnich 12 miesięcy
|
|
||||||
EMailTextProposalValidated=%s wniosek został zatwierdzony.
|
|
||||||
EMailTextOrderValidated=Aby %s został zatwierdzony.
|
|
||||||
ResizeDesc=Wpisz nową szerokość <b>lub</b> nowy wysokości. Stosunek będą przechowywane w zmianie rozmiaru ...
|
|
||||||
NewLength=Nowa szerokość
|
|
||||||
NewHeight=Nowa wysokość
|
|
||||||
NewSizeAfterCropping=Nowy rozmiar po przycięciu
|
|
||||||
DefineNewAreaToPick=Określenia nowego obszaru na zdjęcie, aby wybrać (z lewej kliknąć na zdjęcie, a następnie przeciągnąć aż do przeciwnego rogu)
|
|
||||||
CurrentInformationOnImage=Informacje na temat bieżącego obrazu
|
|
||||||
YouReceiveMailBecauseOfNotification=Pojawieniu się tego komunikatu, ponieważ e-mail został dodany do listy celów do informacji o wydarzeniach w szczególności z %s %s oprogramowania.
|
|
||||||
YouReceiveMailBecauseOfNotification2=To wydarzenie jest następujące:
|
|
||||||
ExternalSites=tereny zewnętrzne
|
|
||||||
Notify_ORDER_VALIDATE=ordem do cliente validado
|
|
||||||
Notify_PROPAL_VALIDATE=proposta do cliente validado
|
|
||||||
PredefinedMailTest=Este é um mail de teste. \ NO duas linhas são separadas por um retorno de carro.
|
|
||||||
PredefinedMailTestHtml=Este é um mail <b>de teste</b> (o teste da Palavra deve ser em negrito). <br> As duas linhas são separadas por um retorno de carro.
|
|
||||||
CalculatedWeight=peso calculado
|
|
||||||
CalculatedVolume=volume calculado
|
|
||||||
Length=Comprimento
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=centímetros
|
|
||||||
LengthUnitmm=milímetro
|
|
||||||
Surface=Área
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=dm2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
EMailTextProposalValidated=A proposta %s foi validado.
|
|
||||||
EMailTextOrderValidated=A ordem %s foi validado.
|
|
||||||
ResizeDesc=Digite nova largura <b>ou</b> altura de novo. Razão será mantido durante o redimensionamento ...
|
|
||||||
NewLength=largura Novo
|
|
||||||
NewHeight=Nova altura
|
|
||||||
NewSizeAfterCropping=Novo tamanho após a colheita
|
|
||||||
DefineNewAreaToPick=Definir nova área na imagem para escolher (clique na imagem à esquerda, em seguida, arrastar até chegar ao canto oposto)
|
|
||||||
CurrentInformationOnImage=Informações sobre a imagem atual
|
|
||||||
YouReceiveMailBecauseOfNotification=Você receberá esta mensagem porque seu e-mail foi adicionado à lista de alvos a ser informado dos acontecimentos em particular do software %s %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Este evento é o seguinte:
|
|
||||||
ExternalSites=Sites externos
|
|
||||||
Notify_ORDER_VALIDATE=Клиент для проверки
|
|
||||||
Notify_PROPAL_VALIDATE=Клиент предложение проверки
|
|
||||||
PredefinedMailTest=Это тест почты. \ NЭтот две строки, разделенные символом возврата каретки.
|
|
||||||
PredefinedMailTestHtml=Это <b>тест</b> почты (слово "испытание должно быть жирным шрифтом). <br> 2 линии разделяются символом возврата каретки.
|
|
||||||
CalculatedWeight=Расчетный вес
|
|
||||||
CalculatedVolume=Расчетный объем
|
|
||||||
Length=Длина
|
|
||||||
LengthUnitm=метр
|
|
||||||
LengthUnitdm=дм
|
|
||||||
LengthUnitcm=см
|
|
||||||
LengthUnitmm=мм
|
|
||||||
Surface=Площадь
|
|
||||||
SurfaceUnitm2=м2
|
|
||||||
SurfaceUnitdm2=DM2
|
|
||||||
SurfaceUnitcm2=см2
|
|
||||||
SurfaceUnitmm2=мм2
|
|
||||||
NumberOfUnitsProposals=Количество единиц по предложениям за последние 12 месяцев
|
|
||||||
EMailTextProposalValidated=Предложение %s была утверждена.
|
|
||||||
EMailTextOrderValidated=Для %s была утверждена.
|
|
||||||
ResizeDesc=Введите новые значения ширины <b>или</b> новые высоты. Отношение будут храниться в течение размера ...
|
|
||||||
NewLength=Новая ширина
|
|
||||||
NewHeight=Новая высота
|
|
||||||
NewSizeAfterCropping=Новый размер после обрезания
|
|
||||||
DefineNewAreaToPick=Определить новые области на изображение, чтобы получить (левой кнопкой мыши на изображении, а затем перетащить пока не дойдете до противоположного угла)
|
|
||||||
CurrentInformationOnImage=Информация о текущем изображении
|
|
||||||
YouReceiveMailBecauseOfNotification=Это сообщение появляется, потому что ваше сообщение было добавлено в список целей, которые должны быть проинформированы о конкретных мероприятий в %s программного обеспечения %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Это событие имеет следующий вид:
|
|
||||||
ExternalSites=На внешних сайтах
|
|
||||||
Notify_ORDER_VALIDATE=Stranka da potrdijo
|
|
||||||
Notify_PROPAL_VALIDATE=Customer predlogu potrjene
|
|
||||||
CalculatedWeight=Izračuna masa
|
|
||||||
CalculatedVolume=Izračuna prostornine
|
|
||||||
Length=Dolžina
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=cm
|
|
||||||
LengthUnitmm=mm
|
|
||||||
Surface=Območje
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=dm2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
EMailTextProposalValidated=Predlog je bil %s potrjena.
|
|
||||||
EMailTextOrderValidated=Da %s je bila potrjena.
|
|
||||||
ResizeDesc=Vnesite novo širino <b>ali</b> nove višine. Razmerje se bo še naprej v velikosti ...
|
|
||||||
NewLength=New širina
|
|
||||||
NewHeight=New višina
|
|
||||||
NewSizeAfterCropping=New velikosti po obrezovanje
|
|
||||||
DefineNewAreaToPick=Določite novo področje na sliko za pick (levi klik na sliko nato povlecite, dokler ne dosežete nasprotnem kotu)
|
|
||||||
CurrentInformationOnImage=Informacije o trenutni sliki
|
|
||||||
YouReceiveMailBecauseOfNotification=Prikaže se to sporočilo, ker je bil vaš e-poštni doda na seznam ciljev do obveščenosti določene prireditve v programsko opremo za %s %s.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Ta dogodek je naslednji:
|
|
||||||
ExternalSites=Zunanjih spletnih mest
|
|
||||||
Notify_ORDER_VALIDATE=Müşteri sipariş onaylandı
|
|
||||||
Notify_PROPAL_VALIDATE=Müşteri öneri onaylandı
|
|
||||||
CalculatedWeight=Hesaplanan ağırlık
|
|
||||||
CalculatedVolume=Hesaplanan hacim
|
|
||||||
Length=Uzunluk
|
|
||||||
LengthUnitm=m
|
|
||||||
LengthUnitdm=dm
|
|
||||||
LengthUnitcm=cm
|
|
||||||
LengthUnitmm=mm
|
|
||||||
Surface=Alan
|
|
||||||
SurfaceUnitm2=m2
|
|
||||||
SurfaceUnitdm2=dm2
|
|
||||||
SurfaceUnitcm2=cm2
|
|
||||||
SurfaceUnitmm2=mm2
|
|
||||||
EMailTextProposalValidated=Teklif Ssss doğrulanmıştır.
|
|
||||||
EMailTextOrderValidated=Sipariş Ssss doğrulanmıştır.
|
|
||||||
ResizeDesc=yükseklik <b>OR</b> yeni genişliğini girin yeni. Oranı boyutlandırma sırasında tutulacak ...
|
|
||||||
NewLength=Yeni genişliği
|
|
||||||
NewHeight=Yeni yükseklik
|
|
||||||
NewSizeAfterCropping=kırpma sonra yeni boyut
|
|
||||||
DefineNewAreaToPick=Resmi tanımlayın yeni bir alan (resmine sonra ters köşe ulaşana kadar sürükleyin) sol klik almak için
|
|
||||||
CurrentInformationOnImage=Geçerli görüntüye Bilgiler
|
|
||||||
YouReceiveMailBecauseOfNotification=E-posta hedef listesine Ssss of Ssss yazılımı içine belirli olaylar konusunda bilgi sahibi olmak eklenmiş çünkü bu mesajı alırsınız.
|
|
||||||
YouReceiveMailBecauseOfNotification2=Bu olay şudur:
|
|
||||||
ExternalSites=Harici siteler
|
|
||||||
CalculatedWeight=计算重量
|
CalculatedWeight=计算重量
|
||||||
CalculatedVolume=计算量
|
CalculatedVolume=计算量
|
||||||
// STOP - Lines generated via autotranslator.php tool (2010-07-17 12:40:30).
|
|
||||||
|
|
||||||
|
|
||||||
// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
|
// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ ContractNotRunning=该合同未运行
|
|||||||
ErrorProductAlreadyExists=一个产品的参考％s已经存在。
|
ErrorProductAlreadyExists=一个产品的参考％s已经存在。
|
||||||
ErrorProductBadRefOrLabel=错误的价值参考或标签。
|
ErrorProductBadRefOrLabel=错误的价值参考或标签。
|
||||||
Suppliers=供应商
|
Suppliers=供应商
|
||||||
SupplierRef=供应商参考。
|
SupplierRef=供应商代号:
|
||||||
ShowProduct=显示产品
|
ShowProduct=显示产品
|
||||||
ShowService=显示服务
|
ShowService=显示服务
|
||||||
ProductsAndServicesArea=产品和服务领域
|
ProductsAndServicesArea=产品和服务领域
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ QtyDispatched=派出数量
|
|||||||
OrderDispatch=联合调度
|
OrderDispatch=联合调度
|
||||||
RuleForStockManagementDecrease=为减少库存管理规则
|
RuleForStockManagementDecrease=为减少库存管理规则
|
||||||
RuleForStockManagementIncrease=增加的库存管理规则
|
RuleForStockManagementIncrease=增加的库存管理规则
|
||||||
DeStockOnBill=减少对客户的实际库存发票/信用票据验证
|
DeStockOnBill=减少对客户的实际库存发票/信用票据验证（警告在此版本，它只有在仓库数1，股票被修改）
|
||||||
DeStockOnValidateOrder=减少对客户的订单确认
|
DeStockOnValidateOrder=减少对客户的订单确认（警告在此版本中，真正的股票，它只有在仓库数1，股票被修改）
|
||||||
DeStockOnShipment=减少对实际装运验证股票（推荐）
|
DeStockOnShipment=减少对实际装运验证股票（推荐）
|
||||||
ReStockOnBill=增加对供应商发票的实际库存/信用票据验证
|
ReStockOnBill=增加对供应商发票的实际库存/信用票据验证（警告在此版本中，它只有在仓库数1，股票被修改）
|
||||||
ReStockOnValidateOrder=对供应商的订单增加赞许
|
ReStockOnValidateOrder=对供应商的订单增加赞许（警告在此版本中，真正的股票，它只有在仓库数1，股票被修改）
|
||||||
ReStockOnDispatchOrder=增加人工调度到仓库供应商接到订单后，实时股票
|
ReStockOnDispatchOrder=增加人工调度到仓库供应商接到订单后，实时股票
|
||||||
OrderStatusNotReadyToDispatch=命令还没有或根本没有更多的地位，使产品在仓库库存调度。
|
OrderStatusNotReadyToDispatch=命令还没有或根本没有更多的地位，使产品在仓库库存调度。
|
||||||
StockDiffPhysicTeoric=股票差异的原因和理论物理
|
StockDiffPhysicTeoric=股票差异的原因和理论物理
|
||||||
|
|||||||
Reference in New Issue
Block a user