| '; -print ' | ';
-print ' ';
-print $langs->trans('From') . ' ';
-print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-print ' ';
-print '';
-print $langs->trans('to') . ' ';
-print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-print ' ';
-print ' | ';
-print ''; -print ' | ';
-print ' ';
-print $langs->trans('From').' ';
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
-print ' ';
-print '';
-print $langs->trans('to').' ';
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
-print ' ';
-print ' | ';
-print '';
-print ' ';
-print $langs->trans('From').' ';
-// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-// use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+// Movement number
+if (! empty($arrayfields['t.piece_num']['checked']))
{
- print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+ print ' ';
-print '';
}
-else
+// Date document
+if (! empty($arrayfields['t.doc_date']['checked']))
{
- print '';
+ print ' | ';
+ print ' | ';
}
-print '';
+ print $langs->trans('From') . ' ';
+ print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+ print ' ';
+ print '';
+ print $langs->trans('to') . ' ';
+ print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+ print ' ';
+ print '';
-print $langs->trans('to').' ';
-// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-// use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+// Ref document
+if (! empty($arrayfields['t.doc_ref']['checked']))
{
- print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+ print ' ';
-print '';
}
-else
+// Accountancy account
+if (! empty($arrayfields['t.numero_compte']['checked']))
{
- print '';
+ print ' | ';
+ print ' | ';
}
-print '';
+ print $langs->trans('From').' ';
+ print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
+ print ' ';
+ print '';
+ print $langs->trans('to').' ';
+ print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
+ print ' ';
+ print ' | ';
-print ''; -print ''; -print ' | '; -print ''; -print ' | '; -print ' | '; +// Subledger account +if (! empty($arrayfields['t.subledger_account']['checked'])) +{ + print ' | ';
+ print ' ';
+ print $langs->trans('From').' ';
+ // TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
+ // use setup of keypress to select thirdparty and this hang browser on large database.
+ if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+ {
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+ }
+ else
+ {
+ print '';
+ }
+ print ' ';
+ print '';
+ print $langs->trans('to').' ';
+ // TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
+ // use setup of keypress to select thirdparty and this hang browser on large database.
+ if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+ {
+ print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+ }
+ else
+ {
+ print '';
+ }
+ print ' ';
+ print ' | ';
+}
+// Label operation
+if (! empty($arrayfields['t.label_operation']['checked']))
+{
+ print ''; + print ''; + print ' | '; +} +// Debit +if (! empty($arrayfields['t.debit']['checked'])) +{ + print ''; +} +// Credit +if (! empty($arrayfields['t.credit']['checked'])) +{ + print ' | '; +} +// Code journal +if (! empty($arrayfields['t.code_journal']['checked'])) +{ + print ' | '; +} +// Date creation +if (! empty($arrayfields['t.date_creation']['checked'])) +{ + print ' | ';
+ print ' ';
+ print $langs->trans('From') . ' ';
+ print $form->select_date($search_date_creation_start, 'date_creation_start', 0, 0, 1);
+ print ' ';
+ print '';
+ print $langs->trans('to') . ' ';
+ print $form->select_date($search_date_creation_end, 'date_creation_end', 0, 0, 1);
+ print ' ';
+ print ' | ';
+}
+// Date modification
+if (! empty($arrayfields['t.tms']['checked']))
+{
+ print '';
+ print ' ';
+ print $langs->trans('From') . ' ';
+ print $form->select_date($search_date_modification_start, 'date_modification_start', 0, 0, 1);
+ print ' ';
+ print '';
+ print $langs->trans('to') . ' ';
+ print $form->select_date($search_date_modification_end, 'date_modification_end', 0, 0, 1);
+ print ' ';
+ print ' | ';
+}
+// Action column
print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ' | '; -print '
| ' . $line->piece_num . ' | '; - print '' . dol_print_date($line->doc_date, 'day') . ' | '; - print '' . $line->doc_ref . ' | '; - print '' . length_accountg($line->numero_compte) . ' | '; - print '' . length_accounta($line->subledger_account) . ' | '; - print '' . $line->label_operation . ' | '; - print '' . ($line->debit ? price($line->debit) : ''). ' | '; - print '' . ($line->credit ? price($line->credit) : '') . ' | '; + // Piece number + if (! empty($arrayfields['t.piece_num']['checked'])) + { + print '' . $line->piece_num . ' | '; + if (! $i) $totalarray['nbfield']++; + } - $accountingjournal = new AccountingJournal($db); - $result = $accountingjournal->fetch('',$line->code_journal); - $journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal); - print '' . $journaltoshow . ' | '; + // Document date + if (! empty($arrayfields['t.doc_date']['checked'])) + { + print '' . dol_print_date($line->doc_date, 'day') . ' | '; + if (! $i) $totalarray['nbfield']++; + } - print ''; - print '' . img_edit() . ' '; - print '' . img_delete() . ''; - print ' | '; - print "' . $line->doc_ref . ' | '; + if (! $i) $totalarray['nbfield']++; + } - $i++; + // Account number + if (! empty($arrayfields['t.numero_compte']['checked'])) + { + print '' . length_accountg($line->numero_compte) . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Subledger account + if (! empty($arrayfields['t.subledger_account']['checked'])) + { + print '' . length_accounta($line->subledger_account) . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Label operation + if (! empty($arrayfields['t.label_operation']['checked'])) + { + print '' . $line->label_operation . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Amount debit + if (! empty($arrayfields['t.debit']['checked'])) + { + print '' . ($line->debit ? price($line->debit) : ''). ' | '; + if (! $i) $totalarray['nbfield']++; + if (! $i) $totalarray['totaldebitfield']=$totalarray['nbfield']; + $totalarray['totaldebit'] += $line->debit; + } + + // Amount credit + if (! empty($arrayfields['t.credit']['checked'])) + { + print '' . ($line->credit ? price($line->credit) : '') . ' | '; + if (! $i) $totalarray['nbfield']++; + if (! $i) $totalarray['totalcreditfield']=$totalarray['nbfield']; + $totalarray['totalcredit'] += $line->credit; + } + + // Journal code + if (! empty($arrayfields['t.code_journal']['checked'])) + { + $accountingjournal = new AccountingJournal($db); + $result = $accountingjournal->fetch('',$line->code_journal); + $journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal); + print '' . $journaltoshow . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Creation operation date + if (! empty($arrayfields['t.date_creation']['checked'])) + { + print '' . dol_print_date($line->date_creation, 'day') . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Modification operation date + if (! empty($arrayfields['t.tms']['checked'])) + { + print '' . dol_print_date($line->date_modification, 'day') . ' | '; + if (! $i) $totalarray['nbfield']++; + } + + // Action column + print ''; + print '' . img_edit() . ' '; + print '' . img_delete() . ''; + print ' | '; + if (! $i) $totalarray['nbfield']++; + + print "\n"; + + $i++; + } + + // Show total line + if (isset($totalarray['totaldebitfield']) || isset($totalarray['totalcreditfield'])) + { + $i=0; + while ($i < $totalarray['nbfield']) + { + $i++; + if ($i == 1) + { + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' | '; + else print ''.$langs->trans("Totalforthispage").' | '; + } + elseif ($totalarray['totaldebitfield'] == $i) print ''.price($totalarray['totaldebit']).' | '; + elseif ($totalarray['totalcreditfield'] == $i) print ''.price($totalarray['totalcredit']).' | '; + else print ''; + } + print ''; + + } } -print ' |
| '.$langs->trans("Total").' | '; -else print ''.$langs->trans("Totalforthispage").' | '; -print ''; -print ''; -print price($total_debit); -print ' | '; -print ''; -print price($total_credit); -print ' | '; -print ''; -print ' | ||||||||||||||||
| ' . $langs->trans("ThirdPartyName") . ' | '; +$object->next_prev_filter = "te.fournisseur = 1"; +print $form->showrefnav($object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', ''); +print ' | ||
| ' . $langs->trans('Prefix') . ' | ' . $object->prefix_comm . ' | ||
| ' . $langs->trans("CustomerCode") . ' | '; +print $object->code_client; +if ($object->check_codeclient() != 0) + print ' (' . $langs->trans("WrongCustomerCode") . ')'; +print ' | '; +print '||
| '; +print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer); +print ' | '; +print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer); +print ' | '; +print '||
| ' . $langs->trans("Address") . ' | '; +dol_print_address($object->address, 'gmap', 'thirdparty', $object->id); +print ' | ||
| '.$langs->trans("ThirdPartyName").' | '; - $object->next_prev_filter="te.fournisseur = 1"; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); - print ' | ||
| ' . $langs->trans("Zip") . ' / ' . $langs->trans("Town") . ' | ' . $object->zip . (($object->zip && $object->town) ? ' / ' : '') . $object->town . ' | '; +print '||
| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ||
| ' . $langs->trans("Country") . ' | '; +// $img=picto_from_langcode($object->country_code); +$img = ''; +if ($object->isInEEC()) + print $form->textwithpicto(($img ? $img . ' ' : '') . $object->country, $langs->trans("CountryIsInEEC"), 1, 0); +else + print ($img ? $img . ' ' : '') . $object->country; +print ' | ||
| '.$langs->trans("ThirdPartyName").' | '; - $object->next_prev_filter="te.fournisseur = 1"; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); - print ' | ||
| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ||
| '.$langs->trans("SupplierCode"). ' | '; - print $object->code_fournisseur; - if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; - print ' | '; - print '||
| '; - print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); - print ' | '; - print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); - print ' | '; - print '||
| '.$langs->trans("Address").' | '; - dol_print_address($object->address,'gmap','thirdparty',$object->id); - print ' | ||
| '.$langs->trans("Zip").' / '.$langs->trans("Town").' | '.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.' | '; - print '||
| '.$langs->trans("Country").' | '; - //$img=picto_from_langcode($object->country_code); - $img=''; - if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); - else print ($img?$img.' ':'').$object->country; - print ' | ||
| ' . $langs->trans("ThirdPartyName") . ' | '; +$object->next_prev_filter = "te.fournisseur = 1"; +print $form->showrefnav($object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', ''); +print ' | ||
| ' . $langs->trans('Prefix') . ' | ' . $object->prefix_comm . ' | ||
| ' . $langs->trans("SupplierCode") . ' | '; +print $object->code_fournisseur; +if ($object->check_codefournisseur() != 0) + print ' (' . $langs->trans("WrongSupplierCode") . ')'; +print ' | '; +print '||
| '; +print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer); +print ' | '; +print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer); +print ' | '; +print '||
| ' . $langs->trans("Address") . ' | '; +dol_print_address($object->address, 'gmap', 'thirdparty', $object->id); +print ' | ||
| ' . $langs->trans("Zip") . ' / ' . $langs->trans("Town") . ' | ' . $object->zip . (($object->zip && $object->town) ? ' / ' : '') . $object->town . ' | '; +print '||
| '.$langs->trans("Author").' | '.$author->getFullName($langs)." | '; if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon)) - print ' | id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; print '
| '.$langs->trans("NbOfGenerationDone").' | '; - print ''; - print $object->nb_gen_done?$object->nb_gen_done:'0'; - print ' | '; - print '
| '.$langs->trans("NbOfGenerationDone").' | '; + print ''; + print $object->nb_gen_done?$object->nb_gen_done:'0'; + print ' | '; + print '
| '; - print $langs->trans("DateLastGeneration"); - print ' | '; - print dol_print_date($object->date_last_gen, 'dayhour'); - print ' | '; - print '
| '; + print $langs->trans("DateLastGeneration"); + print ' | '; + print dol_print_date($object->date_last_gen, 'dayhour'); + print ' | '; + print '
| ".$langs->trans("SocialContribution")." | ||||||||||||||||
| '.$langs->trans("Ref").' | '.$chid.' | |||||||||||||||
| '.$langs->trans("Ref").' | '.$chid.' | |||||||||||||||
| '.$langs->trans("Type")." | ".$charge->type_libelle." | |||||||||||||||
| '.$langs->trans("Period")." | ".dol_print_date($charge->periode,'day')." | |||||||||||||||
| '.$langs->trans("Label").' | '.$charge->lib." | |||||||||||||||
| '.$langs->trans("DateDue")." | ".dol_print_date($charge->date_ech,'day')." | |||||||||||||||
| '.$langs->trans("Amount")." | ".price($charge->amount,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| '.$langs->trans("DateDue")." | ".dol_print_date($charge->date_ech,'day')." | |||||||||||||||
| '.$langs->trans("Amount")." | ".price($charge->amount,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| '.$langs->trans("AlreadyPaid").' | '.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| '.$langs->trans("RemainderToPay").' | '.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| ".$langs->trans("Payment").' | '; - print '||||||||||||||||
| '.$langs->trans("AlreadyPaid").' | '.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| '.$langs->trans("RemainderToPay").' | '.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' | |||||||||||||||
| '.$langs->trans("Date").' | ';
$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
@@ -294,7 +302,12 @@ if ($action == 'create')
if ($sumpaid < $objp->amount)
{
$namef = "amount_".$objp->id;
- print '';
+ $nameRemain = "remain_".$objp->id;
+ if (!empty($conf->use_javascript_ajax))
+ print img_picto("Auto fill",'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+ $remaintopay=$objp->amount - $sumpaid;
+ print '';
+ print '';
}
else
{
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index c3231ecccdd..4b5351324a3 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -1,6 +1,7 @@
* Copyright (C) 2004-2017 Laurent Destailleur | ".dol_print_date($data['date'],'day')." | \n";
print ''.$data['link']." | \n";
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 47d4c027185..a456777f631 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -73,6 +73,8 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
if (empty($datev)) $datev=$datep;
+ $type_payment = dol_getIdFromCode($db, GETPOST("paymenttype", 'alpha'), 'c_paiement');
+
$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
$object->datev=$datev;
@@ -82,7 +84,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$object->datesp=$datesp;
$object->dateep=$dateep;
$object->note=GETPOST("note");
- $object->type_payment=GETPOST("paymenttype") > 0 ? GETPOST("paymenttype", "int") : 0;
+ $object->type_payment=($type_payment > 0 ? $type_payment : 0);
$object->num_payment=GETPOST("num_payment");
$object->fk_user_author=$user->id;
@@ -101,7 +103,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Employee")), null, 'errors');
$error++;
}
- if (empty($object->type_payment) || $object->type_payment < 0)
+ if (empty($type_payment) || $type_payment < 0)
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
$error++;
@@ -292,7 +294,7 @@ if ($action == 'create')
// Type payment
print '';
print fieldLabel('PaymentMode','selectpaymenttype',1).' | ';
- $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
+ $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype", '', 2);
print ' | '.$langs->trans("None").' | '.$langs->trans("None").' | ';
+ print '';
+ print ' | '.$langs->trans("AlreadyPaid")." : | ".price($totalpaye)." | |
| '.$langs->trans('Discount').' | '; - if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent); - else print $langs->trans("CompanyHasNoRelativeDiscount"); - $absolute_discount=$object->thirdparty->getAvailableDiscounts(); - print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); - else print $langs->trans("CompanyHasNoAbsoluteDiscount"); - print '.'; - print ' | ||
| '.$langs->trans('Discount').' | '; + if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent); + else print $langs->trans("CompanyHasNoRelativeDiscount"); + $absolute_discount=$object->thirdparty->getAvailableDiscounts(); + print '. '; + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); + else print $langs->trans("CompanyHasNoAbsoluteDiscount"); + print '.'; + print ' | ||
| '; print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer); print ' | '; @@ -1414,577 +1420,577 @@ else print ' | '; print '||
| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' | '; - print ''; - if ($user->societe_id == 0) - { - if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline') - { - $tmpaction='activateline'; - $tmpactionpicto='play'; - $tmpactiontext=$langs->trans("Activate"); - if ($objp->statut == 4) - { - $tmpaction='unactivateline'; - $tmpactionpicto='playstop'; - $tmpactiontext=$langs->trans("Unactivate"); - } + print ' | ||
| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' | '; + print ''; + if ($user->societe_id == 0) + { + if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline') + { + $tmpaction='activateline'; + $tmpactionpicto='play'; + $tmpactiontext=$langs->trans("Activate"); + if ($objp->statut == 4) + { + $tmpaction='unactivateline'; + $tmpactionpicto='playstop'; + $tmpactiontext=$langs->trans("Unactivate"); + } if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) { print ''; print img_picto($tmpactiontext, $tmpactionpicto); print ''; } - } - } - print ' | '; - print "||
| ';
- // Si pas encore active
- if (! $objp->date_debut_reelle) {
- print $langs->trans("DateStartReal").': ';
- if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
- else print $langs->trans("ContractStatusNotRunning");
- }
- // Si active et en cours
- if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
- print $langs->trans("DateStartReal").': ';
- print dol_print_date($objp->date_debut_reelle, 'day');
- }
- // Si desactive
- if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
- print $langs->trans("DateStartReal").': ';
- print dol_print_date($objp->date_debut_reelle, 'day');
- print ' - ';
- print $langs->trans("DateEndReal").': ';
- print dol_print_date($objp->date_fin_reelle, 'day');
- }
- if (! empty($objp->comment)) print " ".$objp->comment; - print ' | ';
+ print '';
+ // Si pas encore active
+ if (! $objp->date_debut_reelle) {
+ print $langs->trans("DateStartReal").': ';
+ if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
+ else print $langs->trans("ContractStatusNotRunning");
+ }
+ // Si active et en cours
+ if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
+ print $langs->trans("DateStartReal").': ';
+ print dol_print_date($objp->date_debut_reelle, 'day');
+ }
+ // Si desactive
+ if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
+ print $langs->trans("DateStartReal").': ';
+ print dol_print_date($objp->date_debut_reelle, 'day');
+ print ' - ';
+ print $langs->trans("DateEndReal").': ';
+ print dol_print_date($objp->date_fin_reelle, 'day');
+ }
+ if (! empty($objp->comment)) print " ".$objp->comment; + print ' | ';
- print ''; + print ' | '; - print ' |
| '.$langs->trans("NotActivatedServices").' '.$num.' | '; + print '|||
|---|---|---|---|
| '.$langs->trans("NotActivatedServices").' '.$num.' | '; print "
| '.$langs->trans("ListOfExpiredServices").' '.$num.' | '; + print '|||
|---|---|---|---|
| '.$langs->trans("ListOfExpiredServices").' '.$num.' | '; print "
| '; + print $object->showOutputField($val, $key, $value, '', '', '', 0); + //print dol_escape_htmltag($object->$key, 1, 1); + print ' | '; + print '|||||||||||||
| '; - else print ' | |||||||||||||
| '; + print ' | |||||||||||||
';
print '
'; + print ' '; + + print ' ';
+ print '';
+ print ' ';
+ print ''; // Cancel for create does not post form if we don't know the backtopage
+ print ' ';
print '';
@@ -1730,6 +2013,15 @@ else if ($id || $ref)
/*
* Lines of products
*/
+ if ($action == 'editline')
+ {
+ print ' | '.$lines[$i]->qty_asked.' | '; - // Qty to ship or shipped - print ''.$lines[$i]->qty_shipped.' | '; - // Qty in other shipments (with shipment and warehouse used) if ($origin && $origin_id > 0) { @@ -1926,6 +2243,123 @@ else if ($id || $ref) } print ''; + if ($action == 'editline' && $lines[$i]->id == $line_id) + { + // edit mode + print '
| ';
+ }
+ else
+ {
+ // Qty to ship or shipped
+ print ''.$lines[$i]->qty_shipped.' | '; + + // Warehouse source + if (! empty($conf->stock->enabled)) + { + print '';
+ if ($lines[$i]->entrepot_id > 0)
+ {
+ $entrepot = new Entrepot($db);
+ $entrepot->fetch($lines[$i]->entrepot_id);
+ print $entrepot->getNomUrl(1);
+ }
+ else if (count($lines[$i]->details_entrepot) > 1)
+ {
+ $detail = '';
+ foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+ {
+ if ($detail_entrepot->entrepot_id > 0)
+ {
+ $entrepot = new Entrepot($db);
+ $entrepot->fetch($detail_entrepot->entrepot_id);
+ $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).' '; + } + } + print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail); + } + print ' | ';
+ }
+
+ // Batch number managment
+ if (! empty($conf->productbatch->enabled))
+ {
+ if (isset($lines[$i]->detail_batch))
+ {
+ print '';
+ if ($lines[$i]->product_tobatch)
+ {
+ $detail = '';
+ foreach ($lines[$i]->detail_batch as $dbatch)
+ {
+ $detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).' '; + } + print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail); + } + else + { + print $langs->trans("NA"); + } + print ' | ';
+ } else {
+ print ''; + } + } + } + // Weight print ' | '; if ($lines[$i]->fk_product_type == 0) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight"); @@ -1941,55 +2375,28 @@ else if ($id || $ref) // Size //print ' | '.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").' | '; - // Warehouse source - if (! empty($conf->stock->enabled)) + if ($action == 'editline' && $lines[$i]->id == $line_id) { - print '';
- if ($lines[$i]->entrepot_id > 0)
- {
- $entrepot = new Entrepot($db);
- $entrepot->fetch($lines[$i]->entrepot_id);
- print $entrepot->getNomUrl(1);
- }
- else if (count($lines[$i]->details_entrepot) > 1)
- {
- $detail = '';
- foreach ($lines[$i]->details_entrepot as $detail_entrepot)
- {
- if ($detail_entrepot->entrepot_id > 0)
- {
- $entrepot = new Entrepot($db);
- $entrepot->fetch($detail_entrepot->entrepot_id);
- $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).' '; - } - } - print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail); - } - print ' | ';
+ print '';
+ print ' '; + print ' '; } - - // Batch number managment - if (! empty($conf->productbatch->enabled)) + else if ($object->statut == 0) { - if (isset($lines[$i]->detail_batch)) + // edit-delete buttons + print ' | '; + print 'id . '">' . img_edit() . ''; + print ' | '; + print ''; + print 'id . '">' . img_delete() . ''; + print ' | '; + + // Display lines extrafields + if (! empty($rowExtrafieldsStart)) { - print '';
- if ($lines[$i]->product_tobatch)
- {
- $detail = '';
- foreach ($lines[$i]->detail_batch as $dbatch)
- {
- $detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).' '; - } - print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail); - } - else - { - print $langs->trans("NA"); - } - print ' | ';
- } else {
- print ''; + print $rowExtrafieldsStart; + print $rowExtrafieldsView; + print $rowEnd; } } print ""; @@ -2000,11 +2407,16 @@ else if ($id || $ref) $line = new ExpeditionLigne($db); $line->fetch_optionals($lines[$i]->id,$extralabelslines); print ' |
| '; print $langs->trans('IncotermLabel'); print ' | '; - if ($user->rights->commande->creer) print ''.img_edit().''; + if ($user->rights->commande->creer) print ''.img_edit().''; else print ' '; print ' |
| '.$langs->trans("DefaultCategoryCar").' | '; + print ''; + print $form->selectExpenseCategories($fuser->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1); + print ' |
| '.$langs->trans("DefaultRangeNumber").' | '; + print ''; + $maxRangeNum = ExpenseReportIk::getMaxRangeNumber($fuser->default_c_exp_tax_cat); + print $form->selectarray('default_range', range(0, $maxRangeNum), $fuser->default_range); + print ' |
| '.$langs->trans("DefaultCategoryCar").' | '; + print ''; + print dol_getIdFromCode($db, $fuser->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label'); + print ' |
| '.$langs->trans("DefaultRangeNumber").' | '; + print ''; + print $fuser->default_range; + print ' |
| '.$langs->trans("ProductsAndServices").' | '; - print ''.$langs->trans("AllProductServicePrices").' '.$object->nbOfProductRefs().''; + print ''.$langs->trans("AllProductReferencesOfSupplier").' '.$object->nbOfProductRefs().''; print ' | |||||
| ' . $langs->trans('BankAccount') . ' | '; - $form->select_comptes($fk_account, 'fk_account', 0, '', 1); - print ' | |||||
| ' . $langs->trans('BankAccount') . ' | '; + $form->select_comptes($fk_account, 'fk_account', 0, '', 1); + print ' | |||||
| '; - print ' | '; - print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); + print ' | '; + print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print ' | ||||
| '.fieldLabel('Currency','multicurrency_code').' | '; - print ''; - print $form->selectMultiCurrency($currency_code, 'multicurrency_code'); + print ' | '; + print $form->selectMultiCurrency($currency_code, 'multicurrency_code'); print ' | ||||
| '; - print $langs->trans('BankAccount'); - print ' | '; - if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) - print ' | id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; - print '
| '; + print $langs->trans('BankAccount'); + print ' | '; + if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) + print ' | id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; + print '
| '; - print $langs->trans('IncotermLabel'); - print ' | '; - if ($user->rights->fournisseur->commande->creer) print ''.img_edit().''; - else print ' '; - print ' |
| '; + print $langs->trans('IncotermLabel'); + print ' | '; + if ($user->rights->fournisseur->commande->creer) print ''.img_edit().''; + else print ' '; + print ' |
| '; - print $langs->trans('BankAccount'); - print ' | '; - if ($action != 'editbankaccount' && $user->rights->fournisseur->facture->creer) - print ' | id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; - print '
| '; + print $langs->trans('BankAccount'); + print ' | '; + if ($action != 'editbankaccount' && $user->rights->fournisseur->facture->creer) + print ' | id.'">'.img_edit($langs->trans('SetBankAccount'),1).' | '; + print '
| '; - print $langs->trans('IncotermLabel'); - print ' | '; - if ($user->rights->fournisseur->facture->creer) print ''.img_edit().''; - else print ' '; - print ' |
| '; + print $langs->trans('IncotermLabel'); + print ' | '; + if ($user->rights->fournisseur->facture->creer) print ''.img_edit().''; + else print ' '; + print ' |
| ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' | '; - print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; - print '||
| ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' | '; + print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; + print '||
| ' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' | '; - print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; - print '||
| ' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' | '; + print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; + print '||
| ' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' | '; - print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; - print '||
| ' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' | '; + print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | '; + print '||
| '.$langs->trans('AmountHT').' | '.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).' | ||
| '.$langs->trans('AmountVAT').' | '.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).' ';
- if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
- else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
- if ($calculationrule == 'totalofround') $calculationrulenum=1;
- else $calculationrulenum=2;
- $s=$langs->trans("ReCalculate").' ';
- $s.=''.$langs->trans("Mode1").'';
- $s.=' / ';
- $s.=''.$langs->trans("Mode2").'';
- print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc",$calculationrulenum).' '.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('','help')); - print ' | ||
| '.$langs->trans('AmountHT').' | '.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).' | ||
| '.$langs->trans('AmountVAT').' | '.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).' ';
+ if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
+ else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
+ if ($calculationrule == 'totalofround') $calculationrulenum=1;
+ else $calculationrulenum=2;
+ $s=$langs->trans("ReCalculate").' ';
+ $s.=''.$langs->trans("Mode1").'';
+ $s.=' / ';
+ $s.=''.$langs->trans("Mode2").'';
+ print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc",$calculationrulenum).' '.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('','help')); + print ' | ||
| '.$langs->transcountry("AmountLT1",$societe->country_code).' | '; - print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' | '; - print '||
| '.$langs->transcountry("AmountLT2",$societe->country_code).' | '; - print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' | '; - print '||
| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).' | ||
| '.$langs->transcountry("AmountLT1",$societe->country_code).' | '; + print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' | '; + print '||
| '.$langs->transcountry("AmountLT2",$societe->country_code).' | '; + print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' | '; + print '||
| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).' | ||
| ' . ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' | '; - print ''.$langs->trans('Date').' | '; - print ''.$langs->trans('Type').' | '; - if (! empty($conf->banque->enabled)) print ''.$langs->trans('BankAccount').' | '; - print ''.$langs->trans('Amount').' | '; - print ''; - print ' |
| ' . ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' | '; + print ''.$langs->trans('Date').' | '; + print ''.$langs->trans('Type').' | '; + if (! empty($conf->banque->enabled)) print ''.$langs->trans('BankAccount').' | '; + print ''.$langs->trans('Amount').' | '; + print ''; + print ' |
| '; - $paymentstatic->id=$objp->rowid; - $paymentstatic->datepaye=$db->jdate($objp->dp); - $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);; - $paymentstatic->num_paiement=$objp->num_paiement; - $paymentstatic->payment_code=$objp->payment_code; - print $paymentstatic->getNomUrl(1); - print ' | '; - print ''.dol_print_date($db->jdate($objp->dp), 'day') . ' | '; - print ''; - print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement; - print ' | '; - if (! empty($conf->banque->enabled)) - { - $bankaccountstatic->id=$objp->baid; - $bankaccountstatic->ref=$objp->baref; - $bankaccountstatic->label=$objp->baref; + print '|||
| '; + $paymentstatic->id=$objp->rowid; + $paymentstatic->datepaye=$db->jdate($objp->dp); + $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);; + $paymentstatic->num_paiement=$objp->num_paiement; + $paymentstatic->payment_code=$objp->payment_code; + print $paymentstatic->getNomUrl(1); + print ' | '; + print ''.dol_print_date($db->jdate($objp->dp), 'day') . ' | '; + print ''; + print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement; + print ' | '; + if (! empty($conf->banque->enabled)) + { + $bankaccountstatic->id=$objp->baid; + $bankaccountstatic->ref=$objp->baref; + $bankaccountstatic->label=$objp->baref; $bankaccountstatic->number = $objp->banumber; if (! empty($conf->accounting->enabled)) { @@ -2413,28 +2463,28 @@ else $bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1); } - print ''; - if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions'); - print ' | '; - } - print '' . price($sign * $objp->amount) . ' | '; - print ''; - if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) - { - print 'rowid.'">'; - print img_delete(); - print ''; - } - print ' | '; - print '
| '.$langs->trans("None").' | '; + if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions'); + print ' | '; + } + print '' . price($sign * $objp->amount) . ' | '; + print ''; + if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) + { + print 'rowid.'">'; + print img_delete(); + print ''; + } + print ' | '; + print ''; + $totalpaye += $objp->amount; + $i++; + } + } + else + { + print '||
| '.$langs->trans("None").' | 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' | '; - $resteapayer = $object->total_ttc - $totalpaye; + $resteapayer = $object->total_ttc - $totalpaye; $resteapayeraffiche = $resteapayer; $cssforamountpaymentcomplete = 'amountpaymentcomplete'; @@ -2585,32 +2635,32 @@ else print ' |