'.$langs->trans('Type').' ';
- print ''."\n";
-
+
+ print '' . $langs->trans('Type') . ' ';
+ print '' . "\n";
+
// Standard invoice
print '';
- print ' ';
- $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+ $desc = $form->textwithpicto($langs->trans("InvoiceStandardAsk"), $langs->transnoentities("InvoiceStandardDesc"), 1);
print $desc;
- print ' ';
- print ' ';
- $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
+ $desc = $form->textwithpicto($langs->trans("InvoiceProForma"), $langs->transnoentities("InvoiceProFormaDesc"), 1);
print $desc;
- print ' ';
- print ' ';
- $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
- print ''.$desc.' ';
- if (($origin=='propal') || ($origin=='commande'))
- {
+ $desc = $form->textwithpicto($langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1);
+ print '' . $desc . ' ';
+ if (($origin == 'propal') || ($origin == 'commande')) {
print '';
- $arraylist=array('amount'=>'FixAmount','variable'=>'VarAmount');
- print $form->selectarray('typedeposit',$arraylist, GETPOST('typedeposit'), 0, 0, 0, '', 1);
+ $arraylist = array('amount' => 'FixAmount','variable' => 'VarAmount');
+ print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit'), 0, 0, 0, '', 1);
print ' ';
- print ''.$langs->trans('Value').': ' . $langs->trans('Value') . ':
';
- print '';
- print ' ';
- $text=$langs->trans("InvoiceReplacementAsk").' ';
- $text.='trans("InvoiceReplacementAsk") . ' ';
+ $text .= 'trans("NoReplacableInvoice") . '';
}
- else
- {
- $text.=''.$langs->trans("NoReplacableInvoice").' ';
- }
- $text.=' ';
- $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+ $text .= ' ';
+ $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceReplacementDesc"), 1);
print $desc;
- print ' ';
- print ' ';
- $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
- // $text.='transnoentities("InvoiceAvoirAsk") . ' ';
+ // $text.='trans("NoInvoiceToCorrect") . '';
}
- else
- {
- $text.=''.$langs->trans("NoInvoiceToCorrect").' ';
- }
- $text.=' ';
- $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+ $text .= ' ';
+ $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1);
print $desc;
- print '
';
print ' '.$langs->trans('Discounts').' ';
- if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",''.$soc->remise_percent.' ');
- else print $langs->trans("CompanyHasNoRelativeDiscount");
- print ' ('.$langs->trans("EditRelativeDiscount").') ';
+ print ' ' . $langs->trans('Discounts') . ' ';
+ if ($soc->remise_percent)
+ print $langs->trans("CompanyHasRelativeDiscount", '' . $soc->remise_percent . ' ');
+ else
+ print $langs->trans("CompanyHasNoRelativeDiscount");
+ print ' (' . $langs->trans("EditRelativeDiscount") . ') ';
print '. ';
print ''.price($absolute_discount).' ',$langs->trans("Currency".$conf->currency));
- else print $langs->trans("CompanyHasNoAbsoluteDiscount");
- print ' ('.$langs->trans("EditGlobalDiscounts").') ';
+ if ($absolute_discount)
+ print $langs->trans("CompanyHasAbsoluteDiscount", '' . price($absolute_discount) . ' ', $langs->trans("Currency" . $conf->currency));
+ else
+ print $langs->trans("CompanyHasNoAbsoluteDiscount");
+ print ' (' . $langs->trans("EditGlobalDiscounts") . ') ';
print '.';
print ' '.$langs->trans('Date').' ';
- $form->select_date($dateinvoice,'','','','',"add",1,1);
+ print ' ' . $langs->trans('Date') . ' ';
+ $form->select_date($dateinvoice, '', '', '', '', "add", 1, 1);
print ' '.$langs->trans('PaymentConditionsShort').' ';
- $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+ print ' ' . $langs->trans('PaymentConditionsShort') . ' ';
+ $form->select_conditions_paiements(isset($_POST ['cond_reglement_id']) ? $_POST ['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
print ' '.$langs->trans('PaymentMode').' ';
- $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+ print ' ' . $langs->trans('PaymentMode') . ' ';
+ $form->select_types_paiements(isset($_POST ['mode_reglement_id']) ? $_POST ['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
print ' '.$langs->trans('Project').' ';
+ print ' ' . $langs->trans('Project') . ' ';
$formproject->select_projects($soc->id, $projectid, 'projectid');
print ' '.$langs->trans('Model').' ';
+ print '' . $langs->trans('Model') . ' ';
print '';
- include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
- $liste=ModelePDFFactures::liste_modeles($db);
- print $form->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
+ include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
+ $liste = ModelePDFFactures::liste_modeles($db);
+ print $form->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
print " ';
- print ''.$langs->trans('NotePublic').' ';
+ print '' . $langs->trans('NotePublic') . ' ';
print '';
- $note_public='';
- if (is_object($objectsrc)) // Take value from source object
+ $note_public = '';
+ if (is_object($objectsrc)) // Take value from source object
{
- $note_public=$objectsrc->note_public;
+ $note_public = $objectsrc->note_public;
}
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
-
- //print ' ';
-
+
+ // print '';
+
// Private note
- if (empty($user->societe_id))
- {
+ if (empty($user->societe_id)) {
print '';
- print ''.$langs->trans('NotePrivate').' ';
+ print '' . $langs->trans('NotePrivate') . ' ';
print '';
- $note_private='';
- if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) // Take value from source object
+ $note_private = '';
+ if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) // Take value from source object
{
- $note_private=$objectsrc->note_private;
+ $note_private = $objectsrc->note_private;
}
$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
- //print ' ';
+ // print '';
}
-
- if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
- {
+
+ if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
// TODO for compatibility
- if ($origin == 'contrat')
- {
+ if ($origin == 'contrat') {
// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
- $objectsrc->remise_absolue=$remise_absolue;
- $objectsrc->remise_percent=$remise_percent;
- $objectsrc->update_price(1,-1,1);
+ $objectsrc->remise_absolue = $remise_absolue;
+ $objectsrc->remise_percent = $remise_percent;
+ $objectsrc->update_price(1, - 1, 1);
}
-
- print "\n";
+
+ print "\n";
print "\n";
- print ''.$langs->trans($newclassname).' '.$objectsrc->getNomUrl(1).' '.$langs->trans('TotalHT').' '.price($objectsrc->total_ht).' '.$langs->trans('TotalVAT').' '.price($objectsrc->total_tva)." ' . $langs->trans($newclassname) . ' ' . $objectsrc->getNomUrl(1) . ' ' . $langs->trans('TotalHT') . ' ' . price($objectsrc->total_ht) . ' ' . $langs->trans('TotalVAT') . ' ' . price($objectsrc->total_tva) . " '.$langs->transcountry("AmountLT1",$mysoc->country_code).' '.price($objectsrc->total_localtax1)." ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ' . price($objectsrc->total_localtax1) . " '.$langs->transcountry("AmountLT2",$mysoc->country_code).' '.price($objectsrc->total_localtax2)." ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ' . price($objectsrc->total_localtax2) . " '.$langs->trans('TotalTTC').' '.price($objectsrc->total_ttc)." ' . $langs->trans('TotalTTC') . ' ' . price($objectsrc->total_ttc) . " ';
-
+
// Zone de choix des produits predefinis a la creation
print '';
print '';
- print ''.$langs->trans('ProductsAndServices').' ';
- print ''.$langs->trans('Qty').' ';
- print ''.$langs->trans('ReductionShort').' ';
+ print '' . $langs->trans('ProductsAndServices') . ' ';
+ print '' . $langs->trans('Qty') . ' ';
+ print '' . $langs->trans('ReductionShort') . ' ';
print ' ';
- if (! empty($conf->service->enabled))
- {
- print ''.$langs->trans('ServiceLimitedDuration').' ';
+ if (! empty($conf->service->enabled)) {
+ print '' . $langs->trans('ServiceLimitedDuration') . ' ';
}
print ' ';
- for ($i = 1 ; $i <= $NBLINES ; $i++)
- {
+ for($i = 1; $i <= $NBLINES; $i ++) {
print '';
print '';
// multiprix
if (! empty($conf->global->PRODUIT_MULTIPRICES))
- $form->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
+ $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size, $soc->price_level);
else
- $form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
+ $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size);
print ' ';
- print ' ';
// Si le module service est actif, on propose des dates de debut et fin a la ligne
- if (! empty($conf->service->enabled))
- {
+ if (! empty($conf->service->enabled)) {
print '';
print '';
print '';
- print $langs->trans('From').' ';
+ print $langs->trans('From') . ' ';
print ' ';
- print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add");
print ' ';
print '';
- print $langs->trans('to').' ';
+ print $langs->trans('to') . ' ';
print ' ';
- print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add");
print '
';
print ' ';
}
print " \n";
}
-
+
print '
';
print '
\n";
-
+
// Button "Create Draft"
- print '';
-
+
$objectsrc->printOriginLinesList();
-
+
print '
';
}
-
+
print ''.$langs->trans("ErrorCantCancelIfReplacementInvoiceNotValidated").'
';
- }
- else
- {
+ if ($objectidnext && $statusreplacement == 0) {
+ print '' . $langs->trans("ErrorCantCancelIfReplacementInvoiceNotValidated") . '
';
+ } else {
// Code
- $close[1]['code']='badcustomer';
- $close[2]['code']='abandon';
+ $close [1] ['code'] = 'badcustomer';
+ $close [2] ['code'] = 'abandon';
// Help
- $close[1]['label']=$langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
- $close[2]['label']=$langs->trans("ConfirmClassifyAbandonReasonOtherDesc");
+ $close [1] ['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
+ $close [2] ['label'] = $langs->trans("ConfirmClassifyAbandonReasonOtherDesc");
// Texte
- $close[1]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$object->ref),$close[1]['label'],1);
- $close[2]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"),$close[2]['label'],1);
+ $close [1] ['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $object->ref), $close [1] ['label'], 1);
+ $close [2] ['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"), $close [2] ['label'], 1);
// arrayreasons
- $arrayreasons[$close[1]['code']]=$close[1]['reason'];
- $arrayreasons[$close[2]['code']]=$close[2]['reason'];
-
+ $arrayreasons [$close [1] ['code']] = $close [1] ['reason'];
+ $arrayreasons [$close [2] ['code']] = $close [2] ['reason'];
+
// Cree un tableau formulaire
- $formquestion=array(
- 'text' => $langs->trans("ConfirmCancelBillQuestion"),
- array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons),
- array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'size' => '100')
- );
-
- $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('CancelBill'),$langs->trans('ConfirmCancelBill',$object->ref),'confirm_canceled',$formquestion,"yes");
+ $formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"),array('type' => 'radio','name' => 'close_code','label' => $langs->trans("Reason"),'values' => $arrayreasons),array('type' => 'text','name' => 'close_note','label' => $langs->trans("Comment"),'value' => '','size' => '100'));
+
+ $formconfirm = $form->formconfirm($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes");
}
}
-
+
// Confirmation de la suppression d'une ligne produit
- if ($action == 'ask_deleteline')
- {
- $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
+ if ($action == 'ask_deleteline') {
+ $formconfirm = $form->formconfirm($_SERVER ["PHP_SELF"] . '?facid=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
}
-
+
// Clone confirmation
- if ($action == 'clone')
- {
+ if ($action == 'clone') {
// Create an array for form
- $formquestion=array(
- //'text' => $langs->trans("ConfirmClone"),
- //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1)
- array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company('','socid','(s.client=1 OR s.client=2 OR s.client=3)',1))
- );
+ $formquestion = array(
+ // 'text' => $langs->trans("ConfirmClone"),
+ // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1)
+ array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company('', 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)));
// Paiement incomplet. On demande si motif = escompte ou autre
- $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes',1);
+ $formconfirm = $form->formconfirm($_SERVER ["PHP_SELF"] . '?facid=' . $object->id, $langs->trans('CloneInvoice'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
}
-
- if (! $formconfirm)
- {
- $parameters=array('lineid'=>$lineid);
- $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
+ if (! $formconfirm) {
+ $parameters = array('lineid' => $lineid);
+ $formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by
+ // hook
}
-
+
// Print form confirm
print $formconfirm;
-
-
-
-
+
// Invoice content
-
+
print '';
-
- $linkback = ''.$langs->trans("BackToList").' ';
-
+
+ $linkback = '' . $langs->trans("BackToList") . ' ';
+
// Ref
- print ''.$langs->trans('Ref').' ';
+ print '' . $langs->trans('Ref') . ' ';
print '';
- $morehtmlref='';
- $discount=new DiscountAbsolute($db);
- $result=$discount->fetch(0,$object->id);
- if ($result > 0)
- {
- $morehtmlref=' ('.$langs->trans("CreditNoteConvertedIntoDiscount",$discount->getNomUrl(1,'discount')).')';
+ $morehtmlref = '';
+ $discount = new DiscountAbsolute($db);
+ $result = $discount->fetch(0, $object->id);
+ if ($result > 0) {
+ $morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", $discount->getNomUrl(1, 'discount')) . ')';
}
- if ($result < 0)
- {
- dol_print_error('',$discount->error);
+ if ($result < 0) {
+ dol_print_error('', $discount->error);
}
print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref);
print ' ';
print '';
print ' ';
print '';
- if ($user->rights->facture->creer && $action == 'refclient')
- {
- print '';
- }
- else
- {
+ } else {
print $object->ref_client;
}
print ' ';
print '';
print ' ';
- if ($action == 'editthirdparty')
- {
- $form->form_thirdparty($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,'socid');
- }
- else
- {
- print ' '.$soc->getNomUrl(1,'compta');
+ if ($action == 'editthirdparty') {
+ $form->form_thirdparty($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->socid, 'socid');
+ } else {
+ print ' ' . $soc->getNomUrl(1, 'compta');
print ' ';
- print '('.$langs->trans('OtherBills').' ';
+ print '(' . $langs->trans('OtherBills') . ' ';
// Outstanding Bill
- $outstandigBills=$soc->get_OutstandingBill();
- print ' - '.$langs->trans('CurrentOutstandingBill').': ';
- print price($outstandigBills,'',$langs,0,0,-1,$conf->currency);
- if ($soc->outstanding_limit != '')
- {
- if ($outstandigBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
- print ' / '.price($soc->outstanding_limit);
+ $outstandigBills = $soc->get_OutstandingBill();
+ print ' - ' . $langs->trans('CurrentOutstandingBill') . ': ';
+ print price($outstandigBills, '', $langs, 0, 0, - 1, $conf->currency);
+ if ($soc->outstanding_limit != '') {
+ if ($outstandigBills > $soc->outstanding_limit)
+ print img_warning($langs->trans("OutstandingBillReached"));
+ print ' / ' . price($soc->outstanding_limit);
}
print ')';
}
print ' '.$langs->trans('Type').' ';
+ print ' ' . $langs->trans('Type') . ' ';
print $object->getLibType();
- if ($object->type == 1)
- {
- $facreplaced=new Facture($db);
+ if ($object->type == 1) {
+ $facreplaced = new Facture($db);
$facreplaced->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
+ print ' (' . $langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)) . ')';
}
- if ($object->type == 2)
- {
- $facusing=new Facture($db);
+ if ($object->type == 2) {
+ $facusing = new Facture($db);
$facusing->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')';
+ print ' (' . $langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)) . ')';
}
-
- $facidavoir=$object->getListIdAvoirFromInvoice();
- if (count($facidavoir) > 0)
- {
- print ' ('.$langs->transnoentities("InvoiceHasAvoir");
- $i=0;
- foreach($facidavoir as $id)
- {
- if ($i==0) print ' ';
- else print ',';
- $facavoir=new Facture($db);
+
+ $facidavoir = $object->getListIdAvoirFromInvoice();
+ if (count($facidavoir) > 0) {
+ print ' (' . $langs->transnoentities("InvoiceHasAvoir");
+ $i = 0;
+ foreach ($facidavoir as $id) {
+ if ($i == 0)
+ print ' ';
+ else
+ print ',';
+ $facavoir = new Facture($db);
$facavoir->fetch($id);
print $facavoir->getNomUrl(1);
}
print ')';
}
- if ($objectidnext > 0)
- {
- $facthatreplace=new Facture($db);
+ if ($objectidnext > 0) {
+ $facthatreplace = new Facture($db);
$facthatreplace->fetch($objectidnext);
- print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
+ print ' (' . $langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)) . ')';
}
print ' '.$langs->trans("EditRelativeDiscounts").' ';
- $addabsolutediscount=''.$langs->trans("EditGlobalDiscounts").' ';
- $addcreditnote=''.$langs->trans("AddCreditNote").' ';
-
- print ''.$langs->trans('Discounts');
+ $addrelativediscount = '' . $langs->trans("EditRelativeDiscounts") . ' ';
+ $addabsolutediscount = '' . $langs->trans("EditGlobalDiscounts") . ' ';
+ $addcreditnote = '' . $langs->trans("AddCreditNote") . ' ';
+
+ print ' ' . $langs->trans('Discounts');
print ' ';
- if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
- else print $langs->trans("CompanyHasNoRelativeDiscount");
- //print ' ('.$addrelativediscount.')';
-
- if ($absolute_discount > 0)
- {
+ if ($soc->remise_percent)
+ print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+ else
+ print $langs->trans("CompanyHasNoRelativeDiscount");
+ // print ' ('.$addrelativediscount.')';
+
+ if ($absolute_discount > 0) {
print '. ';
- if ($object->statut > 0 || $object->type == 2 || $object->type == 3)
- {
- if ($object->statut == 0)
- {
- print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
+ if ($object->statut > 0 || $object->type == 2 || $object->type == 3) {
+ if ($object->statut == 0) {
+ print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
print '. ';
- }
- else
- {
- if ($object->statut < 1 || $object->type == 2 || $object->type == 3)
- {
- $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
- print ' ';
print '';
print ' ';
-
- if ($object->type != 2)
- {
- if ($action == 'editinvoicedate')
- {
- $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date,'invoicedate');
+
+ if ($object->type != 2) {
+ if ($action == 'editinvoicedate') {
+ $form->form_date($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->date, 'invoicedate');
+ } else {
+ print dol_print_date($object->date, 'daytext');
}
- else
- {
- print dol_print_date($object->date,'daytext');
- }
- }
- else
- {
- print dol_print_date($object->date,'daytext');
+ } else {
+ print dol_print_date($object->date, 'daytext');
}
print ' ';
-
-
+
// List of payments
-
- $sign=1;
- if ($object->type == 2) $sign=-1;
-
- $nbrows=8; $nbcols=2;
- if (! empty($conf->projet->enabled)) $nbrows++;
- if (! empty($conf->banque->enabled)) $nbcols++;
- //if (! empty($soc->outstandingbill)) $nbrows++;
- if($mysoc->localtax1_assuj=="1") $nbrows++;
- if($mysoc->localtax2_assuj=="1") $nbrows++;
- if ($selleruserevenustamp) $nbrows++;
-
- print '';
-
+
+ $sign = 1;
+ if ($object->type == 2)
+ $sign = - 1;
+
+ $nbrows = 8;
+ $nbcols = 2;
+ if (! empty($conf->projet->enabled))
+ $nbrows ++;
+ if (! empty($conf->banque->enabled))
+ $nbcols ++;
+ // if (! empty($soc->outstandingbill)) $nbrows++;
+ if ($mysoc->localtax1_assuj == "1")
+ $nbrows ++;
+ if ($mysoc->localtax2_assuj == "1")
+ $nbrows ++;
+ if ($selleruserevenustamp)
+ $nbrows ++;
+
+ print ' ';
+
print '';
-
+
// List of payments already done
print '';
- print ''.($object->type == 2 ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).' ';
- print ''.$langs->trans('Type').' ';
- if (! empty($conf->banque->enabled)) print ''.$langs->trans('BankAccount').' ';
- print ''.$langs->trans('Amount').' ';
+ print '' . ($object->type == 2 ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' ';
+ print '' . $langs->trans('Type') . ' ';
+ if (! empty($conf->banque->enabled))
+ print '' . $langs->trans('BankAccount') . ' ';
+ print '' . $langs->trans('Amount') . ' ';
print ' ';
print ' ';
-
- $var=true;
-
+
+ $var = true;
+
// Payments already done (from payment on this invoice)
$sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
- $sql.= ' c.code as payment_code, c.libelle as payment_label,';
- $sql.= ' pf.amount,';
- $sql.= ' ba.rowid as baid, ba.ref, ba.label';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
- $sql.= ' WHERE pf.fk_facture = '.$object->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
- $sql.= ' ORDER BY p.datep, p.tms';
-
+ $sql .= ' c.code as payment_code, c.libelle as payment_label,';
+ $sql .= ' pf.amount,';
+ $sql .= ' ba.rowid as baid, ba.ref, ba.label';
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
+ $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+ $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
+ $sql .= ' WHERE pf.fk_facture = ' . $object->id . ' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
+ $sql .= ' ORDER BY p.datep, p.tms';
+
$result = $db->query($sql);
- if ($result)
- {
+ if ($result) {
$num = $db->num_rows($result);
$i = 0;
-
- //if ($object->type != 2)
- //{
- if ($num > 0)
- {
- while ($i < $num)
- {
+
+ // if ($object->type != 2)
+ // {
+ if ($num > 0) {
+ while ($i < $num) {
$objp = $db->fetch_object($result);
- $var=!$var;
- print '';
- print ''.img_object($langs->trans('ShowPayment'),'payment').' ';
- print dol_print_date($db->jdate($objp->dp),'day').' ';
- $label=($langs->trans("PaymentType".$objp->payment_code)!=("PaymentType".$objp->payment_code))?$langs->trans("PaymentType".$objp->payment_code):$objp->payment_label;
- print ''.$label.' '.$objp->num_paiement.' ';
- if (! empty($conf->banque->enabled))
- {
- $bankaccountstatic->id=$objp->baid;
- $bankaccountstatic->ref=$objp->ref;
- $bankaccountstatic->label=$objp->ref;
+ $var = ! $var;
+ print '';
+ print '' . img_object($langs->trans('ShowPayment'), 'payment') . ' ';
+ print dol_print_date($db->jdate($objp->dp), 'day') . ' ';
+ $label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
+ print '' . $label . ' ' . $objp->num_paiement . ' ';
+ if (! empty($conf->banque->enabled)) {
+ $bankaccountstatic->id = $objp->baid;
+ $bankaccountstatic->ref = $objp->ref;
+ $bankaccountstatic->label = $objp->ref;
print '';
- if ($bankaccountstatic->id) print $bankaccountstatic->getNomUrl(1,'transactions');
+ if ($bankaccountstatic->id)
+ print $bankaccountstatic->getNomUrl(1, 'transactions');
print ' ';
}
- print ''.price($sign * $objp->amount).' ';
+ print '' . price($sign * $objp->amount) . ' ';
print ' ';
print '' . $langs->trans("None") . ' '.$langs->trans("None").' ';
- if ($object->type != 3) print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
- else print $langs->trans('AlreadyPaid');
- print ' : '.price($totalpaye).' ';
+ if ($object->type != 3)
+ print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
+ else
+ print $langs->trans('AlreadyPaid');
+ print ' : ' . price($totalpaye) . ' ';
- if ($invoice->type == 2) print $langs->trans("CreditNote").' ';
- if ($invoice->type == 3) print $langs->trans("Deposit").' ';
+ print ' ';
+ if ($invoice->type == 2)
+ print $langs->trans("CreditNote") . ' ';
+ if ($invoice->type == 3)
+ print $langs->trans("Deposit") . ' ';
print $invoice->getNomUrl(0);
print ' : ';
- print ''.price($obj->amount_ttc).' ';
+ print '' . price($obj->amount_ttc) . ' ';
print '';
- print 'rowid.'">'.img_delete().' ';
+ print 'rowid . '">' . img_delete() . ' ';
print ' ';
- print $form->textwithpicto($langs->trans("Discount").':',$langs->trans("HelpEscompte"),-1);
- print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- print $form->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1);
- print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- print $form->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1);
- print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- $text=$langs->trans("HelpAbandonOther");
- if ($object->close_note) $text.=''.$langs->trans("Reason").' :'.$object->close_note;
- print $form->textwithpicto($langs->trans("Abandoned").':',$text,-1);
- print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ $text = $langs->trans("HelpAbandonOther");
+ if ($object->close_note)
+ $text .= '' . $langs->trans("Reason") . ' :' . $object->close_note;
+ print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '.$langs->trans("Billed").' : '.price($object->total_ttc).' ' . $langs->trans("Billed") . ' : ' . price($object->total_ttc) . ' ';
- if ($resteapayeraffiche >= 0) print $langs->trans('RemainderToPay');
- else print $langs->trans('ExcessReceived');
+ print ' ';
+ if ($resteapayeraffiche >= 0)
+ print $langs->trans('RemainderToPay');
+ else
+ print $langs->trans('ExcessReceived');
print ' : ';
- print ''.price($resteapayeraffiche).' ' . price($resteapayeraffiche) . ' ';
+ print ' ';
print $langs->trans('AlreadyPaidBack');
- print ' : '.price($sign * $totalpaye).' ' . price($sign * $totalpaye) . ' ';
+
// Billed
- print ''.$langs->trans("Billed").' : '.price($sign * $object->total_ttc).' ' . $langs->trans("Billed") . ' : ' . price($sign * $object->total_ttc) . ' ';
- if ($resteapayeraffiche <= 0) print $langs->trans('RemainderToPayBack');
- else print $langs->trans('ExcessPaydBack');
+ print ' ';
+ if ($resteapayeraffiche <= 0)
+ print $langs->trans('RemainderToPayBack');
+ else
+ print $langs->trans('ExcessPaydBack');
print ' : ';
- print ''.price($sign * $resteapayeraffiche).' ' . price($sign * $resteapayeraffiche) . ' '.$langs->trans('TotalTTC').' : ';
- //print ''.price($sign * $object->total_ttc).' '.$langs->trans('TotalTTC').' : ';
+ // print ''.price($sign *
+ // $object->total_ttc).'
';
-
+
// Margin Infos
- if (! empty($conf->margin->enabled))
- {
+ if (! empty($conf->margin->enabled)) {
print ' ';
print '';
print ' ';
- if ($object->type != 2)
- {
- if ($action == 'editconditions')
- {
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ if ($object->type != 2) {
+ if ($action == 'editconditions') {
+ $form->form_conditions_reglement($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+ } else {
+ $form->form_conditions_reglement($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
}
- else
- {
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'none');
- }
- }
- else
- {
+ } else {
print ' ';
}
print ' ';
print '';
print ' ';
- if ($object->type != 2)
- {
- if ($action == 'editpaymentterm')
- {
- $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm');
+ if ($object->type != 2) {
+ if ($action == 'editpaymentterm') {
+ $form->form_date($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->date_lim_reglement, 'paymentterm');
+ } else {
+ print dol_print_date($object->date_lim_reglement, 'daytext');
+ if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == 1 && ! isset($object->am))
+ print img_warning($langs->trans('Late'));
}
- else
- {
- print dol_print_date($object->date_lim_reglement,'daytext');
- if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == 1 && ! isset($object->am)) print img_warning($langs->trans('Late'));
- }
- }
- else
- {
+ } else {
print ' ';
}
print ' ';
print '';
print ' ';
- if ($action == 'editmode')
- {
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
- }
- else
- {
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
+ if ($action == 'editmode') {
+ $form->form_modes_reglement($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
+ } else {
+ $form->form_modes_reglement($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
}
print ' '.$langs->trans('AmountHT').' ';
- print ''.price($object->total_ht,1,'',1,-1,-1,$conf->currency).' '.$langs->trans('AmountVAT').' '.price($object->total_tva,1,'',1,-1,-1,$conf->currency).' ' . $langs->trans('AmountHT') . ' ';
+ print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ' ' . $langs->trans('AmountVAT') . ' ' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ' '.$langs->transcountry("AmountLT1",$mysoc->country_code).' ';
- print ''.price($object->total_localtax1,1,'',1,-1,-1,$conf->currency).' ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ' '.$langs->transcountry("AmountLT2",$mysoc->country_code).' ';
- print ''.price($object->total_localtax2,1,'',1,-1,-1,$conf->currency).' ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ' ';
print '';
print ' ';
- if ($action == 'editrevenuestamp')
- {
- print '';
- }
- else
- {
- print price($object->revenuestamp,1,'',1,-1,-1,$conf->currency);
+ } else {
+ print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
}
print ' '.$langs->trans('AmountTTC').' '.price($object->total_ttc,1,'',1,-1,-1,$conf->currency).' ' . $langs->trans('AmountTTC') . ' ' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . ' '.$langs->trans('Status').' ';
- print ''.($object->getLibStatut(4,$totalpaye)).' ' . $langs->trans('Status') . ' ';
+ print '' . ($object->getLibStatut(4, $totalpaye)) . ' ';
print '';
-
+
print '';
-
+
print ' ';
- if ($action == 'classify')
- {
- $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
- }
- else
- {
- $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'none');
+ if ($action == 'classify') {
+ $form->form_project($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'projectid');
+ } else {
+ $form->form_project($_SERVER ['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'none');
}
print ' ';
print ' ';
}
-
+
// Other attributes (TODO Move this into an include)
- $res=$object->fetch_optionals($object->id,$extralabels);
- $parameters=array('colspan' => ' colspan="2"');
- $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook) && ! empty($extrafields->attribute_label))
- {
-
- foreach($extrafields->attribute_label as $key=>$label)
- {
+ $res = $object->fetch_optionals($object->id, $extralabels);
+ $parameters = array('colspan' => ' colspan="2"');
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
+ // hook
+ if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+
+ foreach ($extrafields->attribute_label as $key => $label) {
if ($action == 'edit_extras') {
- $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+ $value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
} else {
- $value=$object->array_options["options_".$key];
+ $value = $object->array_options ["options_" . $key];
}
- if ($extrafields->attribute_type[$key] == 'separate')
- {
+ if ($extrafields->attribute_type [$key] == 'separate') {
print $extrafields->showSeparator($key);
- }
- else
- {
+ } else {
print 'attribute_required[$key])) print ' class="fieldrequired"';
- print '>'.$label.'';
+ if (! empty($extrafields->attribute_required [$key]))
+ print ' class="fieldrequired"';
+ print '>' . $label . ' ';
// Convert date into timestamp format
- if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
- {
- $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]);
+ if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) {
+ $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
}
-
- if ($action == 'edit_extras' && $user->rights->facture->creer && GETPOST('attribute') == $key)
- {
- print '';
+ } else {
+ print $extrafields->showOutputField($key, $value);
+ if ($object->statut == 0 && $user->rights->facture->creer)
+ print '' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . ' ';
}
- else
- {
- print $extrafields->showOutputField($key,$value);
- if ($object->statut == 0 && $user->rights->facture->creer) print ''.img_picto('','edit').' '.$langs->trans('Modify').' ';
- }
- print '
';
-
- $parameters=array();
- $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook))
- {
+
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+ // modified by hook
+ if (empty($reshook)) {
// Editer une facture deja validee, sans paiement effectue et pas exporte en compta
- if ($object->statut == 1)
- {
+ if ($object->statut == 1) {
// On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
$ventilExportCompta = $object->getVentilExportCompta();
-
- if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0)
- {
- if (! $objectidnext)
- {
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate)
- {
- print '
';
+
+ if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0) {
+ if (! $objectidnext) {
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate) {
+ print '
';
+ } else {
+ print '
' . $langs->trans('Modify') . '
';
}
- else
- {
- print '
'.$langs->trans('Modify').'
';
- }
- }
- else
- {
- print '
'.$langs->trans('Modify').'
';
+ } else {
+ print '
' . $langs->trans('Modify') . '
';
}
}
}
-
+
// Reopen a standard paid invoice
- if (($object->type == 0 || $object->type == 1) && ($object->statut == 2 || $object->statut == 3) && $user->rights->facture->creer) // A paid invoice (partially or completely)
+ if (($object->type == 0 || $object->type == 1) && ($object->statut == 2 || $object->statut == 3) && $user->rights->facture->creer) // A paid
+ // invoice
+ // (partially or
+ // completely)
{
- if (! $objectidnext && $object->close_code != 'replaced') // Not replaced by another invoice
+ if (! $objectidnext && $object->close_code != 'replaced') // Not replaced by another invoice
{
- print '
';
- }
- else
- {
- print '
'.$langs->trans('ReOpen').'
';
+ print '
';
+ } else {
+ print '
' . $langs->trans('ReOpen') . '
';
}
}
-
+
// Validate
- if ($object->statut == 0 && count($object->lines) > 0 &&
- (
- (($object->type == 0 || $object->type == 1 || $object->type == 3 || $object->type == 4) && (! empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0))
- || ($object->type == 2 && $object->total_ttc <= 0))
- )
- {
- if ($user->rights->facture->valider)
- {
- print '
';
+ if ($object->statut == 0 && count($object->lines) > 0 && ((($object->type == 0 || $object->type == 1 || $object->type == 3 || $object->type == 4) && (! empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == 2 && $object->total_ttc <= 0))) {
+ if ($user->rights->facture->valider) {
+ print '
';
}
}
-
+
// Send by mail
- if (($object->statut == 1 || $object->statut == 2))
- {
- if ($objectidnext)
- {
- print '
'.$langs->trans('SendByMail').'
';
- }
- else
- {
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send)
- {
- print '
';
- }
- else print '
';
+ if (($object->statut == 1 || $object->statut == 2)) {
+ if ($objectidnext) {
+ print '
' . $langs->trans('SendByMail') . '
';
+ } else {
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
+ print '
';
+ } else
+ print '
';
}
}
-
- if (! empty($conf->global->FACTURE_SHOW_SEND_REMINDER)) // For backward compatibility
+
+ if (! empty($conf->global->FACTURE_SHOW_SEND_REMINDER)) // For backward compatibility
{
- if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0)
- {
- if ($objectidnext)
- {
- print '
'.$langs->trans('SendRemindByMail').'
';
- }
- else
- {
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send)
- {
- print '
';
- }
- else print '
';
+ if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0) {
+ if ($objectidnext) {
+ print '
' . $langs->trans('SendRemindByMail') . '
';
+ } else {
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
+ print '
';
+ } else
+ print '
';
}
}
}
-
+
// Create payment
- if ($object->type != 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement)
- {
- if ($objectidnext)
- {
- print '
'.$langs->trans('DoPayment').'
';
- }
- else
- {
- if ($resteapayer == 0)
- {
- print '
'.$langs->trans('DoPayment').'
';
- }
- else
- {
- print '
';
+ if ($object->type != 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
+ if ($objectidnext) {
+ print '
' . $langs->trans('DoPayment') . '
';
+ } else {
+ if ($resteapayer == 0) {
+ print '
' . $langs->trans('DoPayment') . '
';
+ } else {
+ print '
';
}
}
}
-
+
// Reverse back money or convert to reduction
- if ($object->type == 2 || $object->type == 3)
- {
+ if ($object->type == 2 || $object->type == 3) {
// For credit note only
- if ($object->type == 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement)
- {
- print '
';
+ if ($object->type == 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
+ print '
';
}
// For credit note
- if ($object->type == 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->creer && $object->getSommePaiement() == 0)
- {
- print '
';
+ if ($object->type == 2 && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->creer && $object->getSommePaiement() == 0) {
+ print '
';
}
// For deposit invoice
- if ($object->type == 3 && $object->statut == 1 && $resteapayer == 0 && $user->rights->facture->creer)
- {
- print '
';
+ if ($object->type == 3 && $object->statut == 1 && $resteapayer == 0 && $user->rights->facture->creer) {
+ print '
';
}
}
-
+
// Classify paid (if not deposit and not credit note. Such invoice are "converted")
- if ($object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement &&
- (($object->type != 2 && $object->type != 3 && $resteapayer <= 0) || ($object->type == 2 && $resteapayer >= 0)) )
- {
- print '
';
+ if ($object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement && (($object->type != 2 && $object->type != 3 && $resteapayer <= 0) || ($object->type == 2 && $resteapayer >= 0))) {
+ print '
';
}
-
+
// Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
- if ($object->statut == 1 && $object->paye == 0 && $resteapayer > 0
- && $user->rights->facture->paiement)
- {
- if ($totalpaye > 0 || $totalcreditnotes > 0)
- {
+ if ($object->statut == 1 && $object->paye == 0 && $resteapayer > 0 && $user->rights->facture->paiement) {
+ if ($totalpaye > 0 || $totalcreditnotes > 0) {
// If one payment or one credit note was linked to this invoice
- print '
';
- }
- else
- {
- if ($objectidnext)
- {
- print '
'.$langs->trans('ClassifyCanceled').'
';
- }
- else
- {
- print '
';
+ print '
';
+ } else {
+ if ($objectidnext) {
+ print '
' . $langs->trans('ClassifyCanceled') . '
';
+ } else {
+ print '
';
}
}
}
-
+
// Clone
- if (($object->type == 0 || $object->type == 3 || $object->type == 4) && $user->rights->facture->creer)
- {
- print '
';
+ if (($object->type == 0 || $object->type == 3 || $object->type == 4) && $user->rights->facture->creer) {
+ print '
';
}
-
+
// Clone as predefined
- if (($object->type == 0 || $object->type == 3 || $object->type == 4) && $object->statut == 0 && $user->rights->facture->creer)
- {
- if (! $objectidnext)
- {
- print '
';
+ if (($object->type == 0 || $object->type == 3 || $object->type == 4) && $object->statut == 0 && $user->rights->facture->creer) {
+ if (! $objectidnext) {
+ print '
';
}
}
-
+
// Delete
- if ($user->rights->facture->supprimer)
- {
- if (! $object->is_erasable())
- {
- print '
';
- }
- else if ($objectidnext)
- {
- print '
';
- }
- elseif ($object->getSommePaiement())
- {
- print '
';
- }
- else
- {
- print '
';
+ if ($user->rights->facture->supprimer) {
+ if (! $object->is_erasable()) {
+ print '
';
+ } else if ($objectidnext) {
+ print '
';
+ } elseif ($object->getSommePaiement()) {
+ print '
';
+ } else {
+ print '
';
}
+ } else {
+ print '
';
}
- else
- {
- print '
';
- }
-
+
print '
';
print '
'; // ancre
-
+
// Documents generes
- $filename=dol_sanitizeFileName($object->ref);
- $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
- $urlsource=$_SERVER['PHP_SELF'].'?facid='.$object->id;
- $genallowed=$user->rights->facture->creer;
- $delallowed=$user->rights->facture->supprimer;
-
- print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
- $somethingshown=$formfile->numoffiles;
-
+ $filename = dol_sanitizeFileName($object->ref);
+ $filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
+ $urlsource = $_SERVER ['PHP_SELF'] . '?facid=' . $object->id;
+ $genallowed = $user->rights->facture->creer;
+ $delallowed = $user->rights->facture->supprimer;
+
+ print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+ $somethingshown = $formfile->numoffiles;
+
// Linked object block
- $somethingshown=$object->showLinkedObjectBlock();
-
- if (empty($somethingshown) && $object->statut > 0)
- {
- print '
'.$langs->trans('LinkedOrder').' ';
-
+ $somethingshown = $object->showLinkedObjectBlock();
+
+ if (empty($somethingshown) && $object->statut > 0) {
+ print '
' . $langs->trans('LinkedOrder') . ' ';
+
print '
';
-
+
$sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."commande as c";
- $sql.= ' WHERE c.fk_soc = '.$soc->id.'';
-
+ $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+ $sql .= ", " . MAIN_DB_PREFIX . "commande as c";
+ $sql .= ' WHERE c.fk_soc = ' . $soc->id . '';
+
$resqlorderlist = $db->query($sql);
- if ($resqlorderlist)
- {
+ if ($resqlorderlist) {
$num = $db->num_rows($resqlorderlist);
$i = 0;
-
+
print '
';
$db->free($resqlorderlist);
- }
- else
- {
+ } else {
dol_print_error($db);
}
-
+
print '
';
}
-
+
// Link for paypal payment
- if (! empty($conf->paypal->enabled) && $object->statut != 0)
- {
- include_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
- print showPaypalPaymentUrl('invoice',$object->ref);
+ if (! empty($conf->paypal->enabled) && $object->statut != 0) {
+ include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
+ print showPaypalPaymentUrl('invoice', $object->ref);
}
-
+
print '
';
-
+
// List of actions on element
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
- $formactions=new FormActions($db);
- $somethingshown=$formactions->showactions($object,'invoice',$socid);
-
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'invoice', $socid);
+
print '
+ * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2006 Andre Cianfarani
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2014 Raphaël Doursenaud
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
*
* 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
@@ -21,10 +21,12 @@
* \brief Class file to manage Dolibarr database access
*/
+require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';
+
/**
* Class to manage Dolibarr database access
*/
-abstract class DoliDB
+abstract class DoliDB implements Database
{
//! Database handler
public $db;
@@ -92,6 +94,5 @@ abstract class DoliDB
return '';
}
}
-
}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index c50a7ed8925..e80c2957088 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -237,6 +237,9 @@ class DoliDBMssql extends DoliDB
*/
function getDriverInfo()
{
+ // FIXME: Dummy method
+ // TODO: Implement
+
return '';
}
@@ -310,15 +313,16 @@ class DoliDBMssql extends DoliDB
/**
* Annulation d'une transaction et retour aux anciennes valeurs
*
- * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+ * @param string $log Add more log to default log line
+ * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
*/
- function rollback()
+ function rollback($log='')
{
if ($this->transaction_opened<=1)
{
$ret=$this->query("ROLLBACK TRANSACTION");
$this->transaction_opened=0;
- dol_syslog("ROLLBACK Transaction",LOG_DEBUG);
+ dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
return $ret;
}
else
@@ -804,6 +808,23 @@ class DoliDBMssql extends DoliDB
return $this->_results;
}
+ /**
+ * List information of columns into a table.
+ *
+ * @param string $table Name of table
+ * @return array Tableau des informations des champs de la table
+ */
+ function DDLInfoTable($table)
+ {
+
+ // FIXME: Dummy method
+ // TODO: Implement
+ // May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
+
+ $infotables=array();
+ return $infotables;
+ }
+
/**
* Create a table into database
*
@@ -975,6 +996,24 @@ class DoliDBMssql extends DoliDB
else return 1;
}
+ /**
+ * Create a user and privileges to connect to database (even if database does not exists yet)
+ *
+ * @param string $dolibarr_main_db_host Ip serveur
+ * @param string $dolibarr_main_db_user Nom user a creer
+ * @param string $dolibarr_main_db_pass Mot de passe user a creer
+ * @param string $dolibarr_main_db_name Database name where user must be granted
+ * @return int <0 if KO, >=0 if OK
+ */
+ function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+ {
+ // FIXME: Dummy method
+ // TODO: Implement
+ // May help: http://msdn.microsoft.com/fr-fr/library/ms173463.aspx
+
+ // Always fail for now
+ return -1;
+ }
/**
* Return charset used to store data in database
@@ -983,15 +1022,9 @@ class DoliDBMssql extends DoliDB
*/
function getDefaultCharacterSetDatabase()
{
- /*
- $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
- if (!$resql)
- {
- return $this->forcecharset;
- }
- $liste=$this->fetch_array($resql);
- return $liste['Value'];
- */
+ // FIXME: Dummy method
+ // TODO: Implement
+
return '';
}
@@ -1002,25 +1035,10 @@ class DoliDBMssql extends DoliDB
*/
function getListOfCharacterSet()
{
- /*
- $resql=$this->query('SHOW CHARSET');
- $liste = array();
- if ($resql)
- {
- $i = 0;
- while ($obj = $this->fetch_object($resql) )
- {
- $liste[$i]['charset'] = $obj->Charset;
- $liste[$i]['description'] = $obj->Description;
- $i++;
- }
- $this->free($resql);
- } else {
- return null;
- }
- return $liste;
- */
- return ''; // attente debuggage
+ // FIXME: Dummy method
+ // TODO: Implement
+
+ return '';
}
/**
@@ -1046,24 +1064,10 @@ class DoliDBMssql extends DoliDB
*/
function getListOfCollation()
{
- /*
- $resql=$this->query('SHOW COLLATION');
- $liste = array();
- if ($resql)
- {
- $i = 0;
- while ($obj = $this->fetch_object($resql) )
- {
- $liste[$i]['collation'] = $obj->Collation;
- $i++;
- }
- $this->free($resql);
- } else {
- return null;
- }
- return $liste;
- */
- return ''; // attente debugage
+ // FIXME: Dummy method
+ // TODO: Implement
+
+ return '';
}
/**
@@ -1073,6 +1077,8 @@ class DoliDBMssql extends DoliDB
*/
function getPathOfDump()
{
+ // FIXME: Dummy method
+ // TODO: Implement
return '';
}
@@ -1084,9 +1090,42 @@ class DoliDBMssql extends DoliDB
*/
function getPathOfRestore()
{
+ // FIXME: Dummy method
+ // TODO: Implement
return '';
}
+
+ /**
+ * Return value of server parameters
+ *
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
+ */
+ function getServerParametersValues($filter='')
+ {
+ // FIXME: Dummy method
+ // TODO: Implement
+ // May help: SELECT SERVERPROPERTY
+
+ $result=array();
+ return $result;
+ }
+
+ /**
+ * Return value of server status
+ *
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
+ */
+ function getServerStatusValues($filter='')
+ {
+ // FIXME: Dummy method
+ // TODO: Implement
+ // May help: http://www.experts-exchange.com/Database/MS-SQL-Server/Q_20971756.html
+
+ return array();
+ }
}
?>
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 86100d6d7d3..59d302aa3f2 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -84,6 +84,7 @@ class DoliDBMysql extends DoliDB
{
global $conf,$langs;
+ // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
@@ -1196,10 +1197,10 @@ class DoliDBMysql extends DoliDB
}
/**
- * Return value of server parameters
+ * Return value of server parameters
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerParametersValues($filter='')
{
@@ -1218,17 +1219,17 @@ class DoliDBMysql extends DoliDB
}
/**
- * Return value of server status
+ * Return value of server status
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerStatusValues($filter='')
{
$result=array();
$sql='SHOW STATUS';
- if ($filter) $sql.=" LIKE '".addslashes($filter)."'";
+ if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
$resql=$this->query($sql);
if ($resql)
{
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 4cc57a880b8..d26026e9f95 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -84,9 +84,9 @@ class DoliDBMysqli extends DoliDB
{
global $conf,$langs;
- // TODO error in strict mode (static property for "$forcecharset" and "$forcecollate")
- //if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
- //if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+ // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+ if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
+ if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
$this->database_user=$user;
@@ -233,6 +233,16 @@ class DoliDBMysqli extends DoliDB
return $this->db;
}
+ /**
+ * Return label of manager
+ *
+ * @return string Label
+ */
+ function getLabel()
+ {
+ return $this->label;
+ }
+
/**
* Return version of database server
*
@@ -1190,10 +1200,10 @@ class DoliDBMysqli extends DoliDB
}
/**
- * Return value of server parameters
+ * Return value of server parameters
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerParametersValues($filter='')
{
@@ -1212,17 +1222,17 @@ class DoliDBMysqli extends DoliDB
}
/**
- * Return value of server status
+ * Return value of server status (current indicators on memory, cache...)
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerStatusValues($filter='')
{
$result=array();
$sql='SHOW STATUS';
- if ($filter) $sql.=" LIKE '".addslashes($filter)."'";
+ if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
$resql=$this->query($sql);
if ($resql)
{
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 531427b9547..cfb25e76508 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -85,6 +85,7 @@ class DoliDBPgsql extends DoliDB
{
global $conf,$langs;
+ // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
@@ -466,6 +467,9 @@ class DoliDBPgsql extends DoliDB
*/
function getDriverInfo()
{
+ // FIXME: Dummy method
+ // TODO: Implement
+
return '';
}
@@ -541,16 +545,17 @@ class DoliDBPgsql extends DoliDB
/**
* Annulation d'une transaction et retour aux anciennes valeurs
*
- * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+ * @param string $log Add more log to default log line
+ * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
*/
- function rollback()
+ function rollback($log='')
{
dol_syslog('',0,-1);
if ($this->transaction_opened<=1)
{
$ret=$this->query("ROLLBACK;");
$this->transaction_opened=0;
- dol_syslog("ROLLBACK Transaction",LOG_DEBUG);
+ dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
return $ret;
}
else
@@ -1382,17 +1387,17 @@ class DoliDBPgsql extends DoliDB
}
/**
- * Return value of server parameters
+ * Return value of server parameters
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerParametersValues($filter='')
{
$result=array();
$resql='select name,setting from pg_settings';
- if ($filter) $resql.=" WHERE name = '".addslashes($filter)."'";
+ if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
$resql=$this->query($resql);
if ($resql)
{
@@ -1402,5 +1407,27 @@ class DoliDBPgsql extends DoliDB
return $result;
}
+
+ /**
+ * Return value of server status
+ *
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
+ */
+ function getServerStatusValues($filter='')
+ {
+ /* This is to return current running requests.
+ $sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';
+ if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+ $resql=$this->query($sql);
+ if ($resql)
+ {
+ $obj=$this->fetch_object($resql);
+ $result[$obj->Variable_name]=$obj->Value;
+ }
+ */
+
+ return array();
+ }
}
?>
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 37460f0e23c..496de961d68 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -84,6 +84,7 @@ class DoliDBSqlite extends DoliDB
{
global $conf,$langs;
+ // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
@@ -389,6 +390,9 @@ class DoliDBSqlite extends DoliDB
*/
function getDriverInfo()
{
+ // FIXME: Dummy method
+ // TODO: Implement
+
return '';
}
@@ -1305,10 +1309,10 @@ class DoliDBSqlite extends DoliDB
}
/**
- * Return value of server parameters
+ * Return value of server parameters
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerParametersValues($filter='')
{
@@ -1327,17 +1331,17 @@ class DoliDBSqlite extends DoliDB
}
/**
- * Return value of server status
+ * Return value of server status
*
- * @param string $filter Filter list on a particular value
- * @return string Value for parameter
+ * @param string $filter Filter list on a particular value
+ * @return array Array of key-values (key=>value)
*/
function getServerStatusValues($filter='')
{
$result=array();
$sql='SHOW STATUS';
- if ($filter) $sql.=" LIKE '".addslashes($filter)."'";
+ if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
$resql=$this->query($sql);
if ($resql)
{
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 42da0b04d38..aa0a422d91f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -3,7 +3,7 @@
* Copyright (C) 2006 Rodolphe Quiedeville
* Copyright (C) 2007 Patrick Raguin
* Copyright (C) 2010-2012 Regis Houssin
- * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2013-2014 Florian Henry
* Copyright (C) 2013 Juanjo Menent
* Copyright (C) 2013 Christophe Battarel
* Copyright (C) 2013 Alexandre Spangaro
@@ -136,6 +136,16 @@ function societe_prepare_head($object)
$h++;
}
+ if (($object->client==1 || $object->client==2 || $object->client==3) && (! empty ( $conf->global->PRODUIT_CUSTOMER_PRICES )))
+ {
+ $langs->load("products");
+ // price
+ $head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
+ $head[$h][1] = $langs->trans("CustomerPrices");
+ $head[$h][2] = 'price';
+ $h++;
+ }
+
// Log
$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Info");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 19d2adeea93..3e73d4320c3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2868,7 +2868,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
global $db, $conf, $mysoc;
if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) $thirdparty_seller=$mysoc;
-
+
dol_syslog("get_localtax tva=".$tva." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj." thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
// Some test to guess with no need to make database access
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 8d9c3bdd18b..205791624c1 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -270,7 +270,7 @@ class modSociete extends DolibarrModules
$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
$this->export_entities_array[$r]=array(); // We define here only fields that use another picto
// Add extra fields
- $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
+ $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
$resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example)
{
diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php
index 0c03206ae67..d27268be121 100644
--- a/htdocs/core/tpl/objectline_add.tpl.php
+++ b/htdocs/core/tpl/objectline_add.tpl.php
@@ -107,7 +107,7 @@ if (! empty($conf->margin->enabled)) {
'select_type'
)
);
- $form->select_produits('', 'idprod', '', $conf->product->limit_size, $buyer->price_level, 1, 2, '', 3, $ajaxoptions);
+ $form->select_produits('', 'idprod', '', $conf->product->limit_size, $buyer->price_level, 1, 2, '', 3, $ajaxoptions,$buyer->id);
}
?>
| ';
$filtertype='';
if (! empty($object->element) && $object->element == 'contrat') $filtertype='1';
- $form->select_produits('','idprod',$filtertype,$conf->product->limit_size,$buyer->price_level);
+ $form->select_produits('','idprod',$filtertype,$conf->product->limit_size,$buyer->price_level, 1, 2, '', 3, array(),$buyer->id);
echo ' ';
if (is_object($hookmanager))
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 6ab80b6ad88..0bb1b6c12b2 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -618,6 +618,15 @@ class InterfaceActionsAuto
if ($ok)
{
$now=dol_now();
+
+ if(isset($_SESSION['listofnames']))
+ {
+ $attachs=$_SESSION['listofnames'];
+ if($attachs && strpos($action,'SENTBYMAIL'))
+ {
+ $object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs;
+ }
+ }
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 15e08bad604..8af37f67361 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -31,7 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcontract.class.php';
if (! empty($conf->projet->enabled))
{
@@ -858,7 +857,8 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheint
$form = new Form($db);
$formfile = new FormFile($db);
-$formcontract = new FormContract($db);
+if ($conf->contrat->enabled)
+ $formcontract = new FormContract($db);
llxHeader('',$langs->trans("Fichinter"));
@@ -983,7 +983,7 @@ if ($action == 'create')
$numprojet=$formproject->select_projects($soc->id,GETPOST('projectid','int'),'projectid');
if ($numprojet==0)
{
- print ' '.$langs->trans("AddProject").' ';
+ print ' '.$langs->trans("AddProject").' ';
}
print '
+-- Copyright (C) 2005-2012 Laurent Destailleur
+-- Copyright (C) 2009-2012 Regis Houssin
+-- Copyright (C) 2013 Florian Henry
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
+-- Copyright (C) 2009-2011 Laurent Destailleur
+-- Copyright (C) 2009-2013 Regis Houssin
+-- Copyright (C) 2012 Juanjo Menent
+-- Copyright (C) 2013 Florian Henry
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
+-- Copyright (C) 2009 Laurent Destailleur
+-- Copyright (C) 2013 Florian Henry
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see %s records on %s %s without barcode defined.
-InitEmptyBarCode=Init the %s barcode
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
+AllBarcodeReset=All barcode values have been removed
NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+
# Modules
Module0Name=Users & groups
Module0Desc=Users and groups management
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index fa3144d0475..a84d929550a 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -220,5 +220,10 @@ DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code
DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
BarCodeDataForProduct=Barcode information of product %s :
BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-BarcodeStickersMask=xxx
-
+ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
+PriceByCustomer=Price by customer
+PriceCatalogue=Catalogue Price
+PricingRule=Pricing Rules
+AddCustomerPrice=Add price by customers
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Price by customer log
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index eb2364cfc4f..d4a501e76a8 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -287,7 +287,7 @@ CurrentVersion=Versión actual de Dolibarr
CallUpdatePage=Llamar a la página de actualización de la estructura y datos de la base de datos %s.
LastStableVersion=Última versión estable disponible
GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:{000000} corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. {000000+000} Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. {000000@x} igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. {dd} dÃas (01 a 31). {mm} mes (01 a 12). {yy} , {yyyy} ou {y} año en 2, 4 ó 1 cifra.{cccc} the client code{cccc000} the client code on n characters is followed by a client's ref counter without offset and zeroized with the global counter.{tttt} The code of company type on n characters (see dictionary-company types).{cccc} el código de cliente en n caracteres{cccc000} el código de cliente en n caracteres es seguido por un contador propio al cliente sin offset, completado con ceros hasta completar la máscara, y volviendo a cero al mismo tiempo que el contador global.{tttt} El código del tipo de la empresa en n caracteres (ver diccionarios-tipos de empresas).Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: Ejemplo sobre un tercero creado el 31/03/2007: %s .
DataComeFromNoWhere=El valor a insertar no corresponde a ningún campo del archivo origen.
DataComeFromFileFieldNb=El valor a insertar se corresponde al campo número %s del archivo origen.
DataComeFromIdFoundFromRef=El valor dado por el campo %s del archivo origen será utilizado para encontrar el ID del objeto padre a usar (el objeto %s con la referencia del archivo origen debe existir en Dolibarr).
-# DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s ). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=El código del campo número %s del archivo de origen se utilizará para encontrar el id del objeto padre a usar (el código del archivo de origen debe existir en el diccionario %s ). Tenga en cuenta que si conoce el id, puede usarlo en lugar del código en el archivo de origen. La importación funcionará en los 2 casos.
DataIsInsertedInto=Los datos del archivo de origen se insertarán en el siguiente campo:
DataIDSourceIsInsertedInto=El ID del objeto padre encontrado a partir del dato origen, se insertará en el siguiente campo:
DataCodeIDSourceIsInsertedInto=El id de la lÃnea padre encontrada a partir del código, se insertará en el siguiente campo:
SourceRequired=Datos de origen obligatorios
SourceExample=Ejemplo de datos de origen posibles
ExampleAnyRefFoundIntoElement=Todas las referencias encontradas para los elementos %s
-# ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s
+ExampleAnyCodeOrIdFoundIntoDictionary=Cualquier código (o identificador) encontrado en el diccionario %s
CSVFormatDesc=Archivo con formato Valores separados por coma (.csv).Excel (.xls)Excel (.xlsx)%s
WarehouseForStockIncrease=Para el incremento de stock se usará el almacén %s
ForThisWarehouse=Para este almacén
-ReplenishmentStatusDesc=Este listado le permite ver productos con un stock inferior a la cantidad mÃnima deseada (o valor de alerta si el checkbok "Sólo alertas" está activado) y le sugiere crear los pedidos a proveedores para completar la diferencia.
+ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia.
ReplenishmentOrdersDesc=Este es el listado de pedidos a proveedores en curso
Replenishments=Reaprovisionamiento
NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index d8c8c3e76d8..474e1e95873 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -217,4 +217,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Définition du type ou valeure du co
BarCodeDataForProduct=Information de code barre du produit %s :
BarCodeDataForThirdparty=Information de code barre du tiers %s :
BarcodeStickersMask=xxx
-
+PriceByCustomer=Prix par clients
+PriceCatalogue=Prix unique
+PricingRule=Régles de prix
+AddCustomerPrice=Ajouter un prix par client
+ForceUpdateChildPriceSoc=Mettre le même prix pour les filliales
+PriceByCustomerLog=Historique prix par client
\ No newline at end of file
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index aaea6a2fd18..4d5cc811e85 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -42,6 +42,17 @@ if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->e
$action = GETPOST('action','alpha');
$value = GETPOST('value','alpha');
+// Pricing Rules
+$select_pricing_rules=array(
+'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'),
+'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'),
+'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer')
+);
+if ($conf->global->MAIN_FEATURES_LEVEL==2) {
+ $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');
+ $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity');
+}
+
/*
* Actions
@@ -96,12 +107,33 @@ else if ($action == 'multiprix_num')
{
$res = dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", $value,'chaine',0,'',$conf->entity);
}
-if ($action == 'multiprix')
+if ($action == 'pricingrule')
{
- $multiprix = GETPOST('activate_multiprix','alpha');
+ $princingrules = GETPOST('princingrule','alpha');
+ foreach ($select_pricing_rules as $rule=>$label) {
- $res = dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $multiprix,'chaine',0,'',$conf->entity);
- $res =dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "5",'chaine',0,'',$conf->entity);
+ if ($rule==$princingrules) {
+ if ( $princingrules =='PRODUCT_PRICE_UNIQ') {
+ $res = dolibarr_set_const($db, 'PRODUIT_MULTIPRICES', 0,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0,'chaine',0,'',$conf->entity);
+ } else {
+ $multirule=explode('&',$princingrules);
+ if (is_array($multirule) && count($multirule)>0) {
+ foreach($multirule as $rulesselected) {
+ $res = dolibarr_set_const($db, $rulesselected, 1,'chaine',0,'',$conf->entity);
+ }
+ } else {
+ $res = dolibarr_set_const($db, $rule, 1,'chaine',0,'',$conf->entity);
+ }
+ }
+ } else {
+ if (strpos($rule,'&')===false) {
+ $res = dolibarr_set_const($db, $rule, 0,'chaine',0,'',$conf->entity);
+ }
+ }
+
+ }
}
else if ($action == 'sousproduits')
{
@@ -278,15 +310,20 @@ print ' '."\n";
* Formulaire parametres divers
*/
-// multiprix activation/desactivation
+
$var=!$var;
print '