From b3dc73e61161634de13f7c3664f6e2d8d89078ca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 May 2017 02:43:51 +0200 Subject: [PATCH] Look and feel v6 --- htdocs/accountancy/admin/productaccount.php | 1 + htdocs/accountancy/bookkeeping/list.php | 1 + htdocs/accountancy/customer/lines.php | 1 + htdocs/accountancy/customer/list.php | 3 +- htdocs/accountancy/expensereport/lines.php | 3 +- htdocs/accountancy/expensereport/list.php | 5 +- htdocs/accountancy/supplier/lines.php | 3 +- htdocs/accountancy/supplier/list.php | 3 +- htdocs/adherents/list.php | 1 + htdocs/adherents/subscription/list.php | 1 + htdocs/adherents/type.php | 1 + htdocs/admin/defaultvalues.php | 1 + htdocs/admin/modules.php | 3 +- htdocs/admin/translation.php | 1 + htdocs/comm/action/listactions.php | 1 + htdocs/comm/action/rapport/index.php | 1 + htdocs/comm/mailing/cibles.php | 2 + htdocs/comm/mailing/list.php | 1 + htdocs/comm/propal/list.php | 3 +- htdocs/commande/list.php | 3 +- htdocs/compta/bank/bankentries.php | 1 + htdocs/compta/bank/index.php | 1 + htdocs/compta/bank/various_payment/index.php | 3 +- htdocs/compta/charges/index.php | 1 + htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/fiche-rec.php | 1 + htdocs/compta/facture/list.php | 5 +- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/paiement/cheque/list.php | 1 + htdocs/compta/paiement/list.php | 1 + htdocs/compta/prelevement/bons.php | 1 + htdocs/compta/prelevement/factures.php | 3 +- htdocs/compta/salaries/index.php | 3 +- htdocs/compta/sociales/card.php | 81 ++++++++++--------- htdocs/compta/sociales/document.php | 23 +++++- htdocs/compta/sociales/index.php | 1 + htdocs/compta/sociales/info.php | 27 ++++++- htdocs/compta/sociales/payments.php | 1 + htdocs/compta/tva/reglement.php | 1 + htdocs/contact/list.php | 1 + htdocs/contrat/list.php | 1 + htdocs/contrat/services.php | 1 + htdocs/core/lib/company.lib.php | 4 +- htdocs/cron/list.php | 1 + htdocs/don/list.php | 1 + htdocs/expedition/list.php | 1 + htdocs/expensereport/list.php | 1 + htdocs/fichinter/list.php | 1 + htdocs/fourn/commande/list.php | 1 + htdocs/fourn/facture/list.php | 1 + htdocs/fourn/facture/paiement.php | 3 +- htdocs/fourn/product/list.php | 1 + htdocs/holiday/list.php | 1 + htdocs/loan/index.php | 1 + .../modulebuilder/skeletons/skeleton_list.php | 1 + htdocs/opensurvey/list.php | 1 + htdocs/product/list-with-listview.php | 1 + htdocs/product/list.php | 1 + htdocs/product/reassort.php | 1 + htdocs/product/reassortlot.php | 1 + htdocs/product/stock/list.php | 3 +- htdocs/product/stock/mouvement.php | 1 + htdocs/product/stock/productlot_list.php | 1 + htdocs/projet/list.php | 1 + htdocs/projet/tasks.php | 1 + htdocs/projet/tasks/list.php | 1 + htdocs/projet/tasks/time.php | 3 +- htdocs/resource/list.php | 1 + htdocs/societe/list.php | 1 + htdocs/societe/notify/card.php | 1 + htdocs/supplier_proposal/list.php | 1 + htdocs/user/group/index.php | 1 + htdocs/user/index.php | 1 + htdocs/user/notify/card.php | 1 + 74 files changed, 178 insertions(+), 64 deletions(-) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 4f82db33e9478..359a8b40c12c6 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -279,6 +279,7 @@ print ''; print ''; print ''; + print ''; print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy'); print '
'; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index b382d8559942c..0c49ac0e1baa1 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -355,6 +355,7 @@ print ''; print ''; print ''; +print ''; $button = ''; if (count($filter)) $button.= $langs->trans("ExportFilteredList"); diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 428e490aff705..52b3a31d6f08d 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -248,6 +248,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneCustomer") . '
'; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 46cb19c2ae138..bbd875e0dbf53 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -263,8 +263,7 @@ print ''; print ''; print ''; - - //$center='
'; + print ''; print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 4205a497c1a39..6d0ffbd447647 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -219,7 +219,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneExpenseReport") . '
'; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 114fd2c99ea89..72316e4c4d622 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -246,9 +246,8 @@ print ''; print ''; print ''; - - //$center='
'; - + print ''; + print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilTodoExpenseReport") . '

'; diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 09cf552c7bbe1..1a95262f86164 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -230,7 +230,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneSupplier") . '
'; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index e702aa8add807..061e465b1e708 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -260,8 +260,7 @@ print ''; print ''; print ''; - - //$center='
'; + print ''; print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 9e0de6f1d7532..1b059d8616db0 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -353,6 +353,7 @@ print ''; print ''; print ''; +print ''; print ''; print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 206f5ebf8c909..55b832e327cc9 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -189,6 +189,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index fb147750e0baf..083ab4bda3bfc 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -191,6 +191,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 7ebc67472d14a..40e63de8aea47 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -220,6 +220,7 @@ print ''; print ''; print ''; +print ''; $head=defaultvalues_prepare_head(); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 433508be9083e..5c4291ff3f362 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -436,7 +436,8 @@ print ''; print ''; print ''; - + print ''; + dol_fiche_head($head, $mode, '', -1); $moreforfilter = ''; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index c9488f919fe6b..72aaa7fe355ec 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -209,6 +209,7 @@ print ''; print ''; print ''; +print ''; $head=translation_prepare_head(); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 301cf63620e25..6ed846c0ebe45 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -324,6 +324,7 @@ print ''; print ''; print ''; + print ''; print ''; $nav=''; if ($optioncss != '') $nav.= ''; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 760d82f024626..125355a338635 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -111,6 +111,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index c302dea1e4332..719dba1a62292 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -428,6 +428,7 @@ print ''; print ''; print ''; + print ''; print ''; $cleartext=''; @@ -443,6 +444,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index f5efbf543834f..e7775a6485e20 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -116,6 +116,7 @@ print ''; print ''; print ''; + print ''; $moreforfilter = ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index af9ffa6d77892..d2a6c6e926f1c 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -407,7 +407,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); if ($massaction == 'presend') diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c73258cff897f..b9102e78ddcb7 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -648,7 +648,8 @@ print ''; print ''; print ''; - print ''; + print ''; + print ''; print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php index ed8241de427f2..fd3c1ec982543 100644 --- a/htdocs/compta/bank/bankentries.php +++ b/htdocs/compta/bank/bankentries.php @@ -578,6 +578,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; if (GETPOST('bid')) print ''; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 37883c29c0fca..8ff5f1964fc35 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -256,6 +256,7 @@ print ''; print ''; print ''; +print ''; print ''; print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1); diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php index abf6d23d22e3b..f189eeef306cc 100644 --- a/htdocs/compta/bank/various_payment/index.php +++ b/htdocs/compta/bank/various_payment/index.php @@ -141,7 +141,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print '
'; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index ee71290be2d3d..a690478a53e82 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -89,6 +89,7 @@ print ''; print ''; print ''; +print ''; print ''; if ($mode != 'sconly') diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index cdca425d5f6d9..93b23834e9f54 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -140,7 +140,7 @@ $totalpaye = $object->getSommePaiement(); - dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill'); + dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill'); // Invoice content diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 3c22b96a1d406..b09bd7f60f3b1 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1652,6 +1652,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 638ca033e1af1..10b11812b1a96 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -433,7 +433,7 @@ if ($search_status == '2') $sql.=" AND f.fk_statut = 2"; // payed Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed) if ($search_status == '3') $sql.=" AND f.fk_statut = 3"; // abandonned } -if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode.""; +if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode; if ($month > 0) { if ($year > 0 && empty($day)) @@ -454,7 +454,7 @@ else if ($year_lim > 0 && ! empty($day_lim)) $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'"; else - $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'"; + $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'"; } else if ($year_lim > 0) { @@ -600,6 +600,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index f3d83278885d2..e9b1694808b3f 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -147,7 +147,7 @@ $head = facture_prepare_head($object); - dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'),0,'bill'); + dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'), -1, 'bill'); // Invoice content diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 9798e2d28b4db..a4fac965e7af0 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -138,6 +138,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index ab4189d53385b..daf7055621348 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -218,6 +218,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 7319de4a7bd86..302e1e9e59c3a 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -105,6 +105,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 72d775a49c3fd..6136ee484996d 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -166,7 +166,8 @@ print ''; print ''; print ''; - print ''; + print ''; + print ''; print ''; $massactionbutton=''; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index e193374a5529e..dc95b06bc52cc 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -150,7 +150,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print '
'; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index f34ff9b1a31eb..630197cfc788d 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -77,6 +77,13 @@ } } +// Link to a project +if ($action == 'classin' && $user->rights->tax->charges->creer) +{ + $object->fetch($id); + $object->setProject(GETPOST('projectid')); +} + if ($action == 'setlib' && $user->rights->tax->charges->creer) { $object->fetch($id); @@ -203,11 +210,9 @@ { $result=$object->fetch($id); - $object->lib = GETPOST('label'); $object->date_ech = $dateech; $object->periode = $dateperiod; $object->amount = price2num($amount); - $object->fk_project = GETPOST("fk_project"); $result=$object->update($user); if ($result <= 0) @@ -276,6 +281,7 @@ $form = new Form($db); $formsocialcontrib = new FormSocialContrib($db); +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card"); $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; @@ -430,15 +436,47 @@ print ''; } - dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill'); + dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill'); $morehtmlref='
'; // Ref customer $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='
'.$langs->trans('Project') . ' '; + if ($user->rights->tax->charges->creer) + { + if ($action != 'classify') + $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : '; + if ($action == 'classify') { + //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); + $morehtmlref.='
'; + $morehtmlref.=''; + $morehtmlref.=''; + $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1); + $morehtmlref.=''; + $morehtmlref.='
'; + } else { + $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); + } + } else { + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.=''; + $morehtmlref.=$proj->ref; + $morehtmlref.=''; + } else { + $morehtmlref.=''; + } + } + } $morehtmlref.='
'; - $linkback = '' . $langs->trans("BackToList") . ''; + $linkback = '' . $langs->trans("BackToList") . ''; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status @@ -449,25 +487,6 @@ print '
'; print ''; - - /* - // Ref - print '"; - */ - - // Label - /*if ($action == 'edit') - { - print ''; - } - else - { - print ''; - }*/ // Type print '"; @@ -508,22 +527,6 @@ print ''; } - // Project - if (! empty($conf->projet->enabled)){ - print ''; - } - // Mode of payment print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id',$linkback); - print "
'.$langs->trans("Label").''; - print ''; - print '
'.$langs->trans("Label").''.$object->lib.'
'.$langs->trans("Type")."".$object->type_libelle."
'.$langs->trans("AmountTTC").''.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
'; - print $langs->trans("Project"); - print ''; - if ($action == 'edit') { - $formproject=new FormProjets($db); - $numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1); - } else { - $project=new Project($db); - $project->fetch($object->fk_project); - print $project->getNomUrl(1,'',1);; - } - print '
'; print '
'; diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 95c72cbedb25e..ce2f853c93525 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -33,6 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) +{ + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +} $langs->load("other"); $langs->load("companies"); @@ -88,6 +93,7 @@ */ $form = new Form($db); +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Documents"); $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; @@ -105,9 +111,24 @@ // Label of social contribution $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='
'.$langs->trans('Project') . ' : '; + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.=''; + $morehtmlref.=$proj->ref; + $morehtmlref.=''; + } else { + $morehtmlref.=''; + } + } $morehtmlref.=''; - $linkback = '' . $langs->trans("BackToList") . ''; + $linkback = '' . $langs->trans("BackToList") . ''; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 50e14823a5f55..194c3f38d993b 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -152,6 +152,7 @@ print ''; print ''; print ''; + print ''; print ''; if ($year) diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index bbacfafd430f0..91334134a2cf6 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -25,6 +25,11 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if (! empty($conf->projet->enabled)) +{ + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +} $langs->load("compta"); $langs->load("bills"); @@ -37,6 +42,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); + /* * Actions */ @@ -49,9 +55,13 @@ setEventMessages($object->error, $object->errors, 'errors'); } + /* * View */ + +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } + $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Info"); $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; llxHeader("",$title,$help_url); @@ -68,9 +78,24 @@ // Label of social contribution $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); +// Project +if (! empty($conf->projet->enabled)) +{ + $langs->load("projects"); + $morehtmlref.='
'.$langs->trans('Project') . ' : '; + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.=''; + $morehtmlref.=$proj->ref; + $morehtmlref.=''; + } else { + $morehtmlref.=''; + } +} $morehtmlref.=''; -$linkback = '' . $langs->trans("BackToList") . ''; +$linkback = '' . $langs->trans("BackToList") . ''; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index eda1633480aba..ae7240c204a65 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -85,6 +85,7 @@ print ''; print ''; print ''; +print ''; print ''; if ($mode != 'sconly') diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 94895062bc366..076978a86fbfb 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -154,6 +154,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 929dbdc91e825..fc601cf8a53ec 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -433,6 +433,7 @@ print ''; print ''; print ''; +print ''; print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 318a24931bee5..43cce90bd1c1a 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -340,6 +340,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index f283502bc3e41..adac837f3e0ad 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -308,6 +308,7 @@ print ''; print ''; print ''; +print ''; $title=$langs->trans("ListOfServices"); if ($mode == "0") $title=$langs->trans("ListOfInactiveServices"); // Must use == "0" diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 3fef1265f9d62..2fa2599e4d32d 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -698,6 +698,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); + $page = GETPOST('page','int'); $search_status = GETPOST("search_status",'int'); if ($search_status=='') $search_status=1; // always display activ customer first $search_name = GETPOST("search_name",'alpha'); @@ -733,7 +734,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; print ''; print ''; - + print ''; + print "\n".''."\n"; $param="socid=".$object->id; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 2eff05868d4db..95338247ecaa5 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -273,6 +273,7 @@ print ''; print ''; print ''; +print ''; print ''; // Line with explanation and button new job diff --git a/htdocs/don/list.php b/htdocs/don/list.php index b0cd414ed286d..daa6f7aa1f209 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -149,6 +149,7 @@ print ''; print ''; print ''; + print ''; print ''; if ($search_all) diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 50454e3f253fb..c838c002cc968 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -280,6 +280,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 06998059aa573..f95952db48208 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -314,6 +314,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9963794fd9ff8..9271a348558ad 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -288,6 +288,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 8ca86a1e6c591..544d882cda329 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -677,6 +677,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 9ad1bf63ce262..e449ed83371a2 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -453,6 +453,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index b6825e93d821b..10851e629e3b5 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -679,7 +679,8 @@ print ''; print ''; print ''; - + print ''; + $moreforfilter=''; $parameters=array(); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 94302eca4be18..ca874511c9483 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -170,6 +170,7 @@ if ($fourn_id > 0) print ''; print ''; print ''; + print ''; print ''; print '
'; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 063c3042e3bf4..30d3dc14f699e 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -282,6 +282,7 @@ print ''; print ''; print ''; +print ''; if ($id > 0) print ''; if ($sall) diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index fdc8cf6707311..b04d3bd90b3b7 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -117,6 +117,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php index 205fcf4be8c1e..9c2581627593b 100644 --- a/htdocs/modulebuilder/skeletons/skeleton_list.php +++ b/htdocs/modulebuilder/skeletons/skeleton_list.php @@ -307,6 +307,7 @@ function init_myfunc() print ''; print ''; print ''; +print ''; print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 636611f91f079..510a054537291 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -89,6 +89,7 @@ print ''; print ''; print ''; +print ''; $moreforfilter = ''; diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php index e3103d8f42624..1ebbf256c9cd5 100644 --- a/htdocs/product/list-with-listview.php +++ b/htdocs/product/list-with-listview.php @@ -689,6 +689,7 @@ function list_get_product_minbuyprice($fk_object) { print ''; print ''; print ''; + print ''; print ''; echo $listHTML; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index c957606b66a4c..7e6ae9b47f49a 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -429,6 +429,7 @@ print ''; print ''; print ''; + print ''; print ''; print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index a87fecd36b716..e460bbec7c590 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -189,6 +189,7 @@ print ''; print ''; print ''; + print ''; print ''; if ($sref || $snom || $sall || GETPOST('search')) diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 660d0e78bd3de..6ab18ac87cb88 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -200,6 +200,7 @@ print ''; print ''; print ''; + print ''; print ''; if ($sref || $snom || $sall || GETPOST('search')) diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index b3361f0b3289e..eefbe3deee972 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -135,7 +135,8 @@ print ''; print ''; print ''; - + print ''; + print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, '', '', $limit); if ($sall) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 506ee68e42b67..5f0f9c213dcc6 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -695,6 +695,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; if ($id > 0) print ''; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index df97621c07b36..78d3c470cb1dc 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -309,6 +309,7 @@ function init_myfunc() print ''; print ''; print ''; + print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index cbf036ef7e3f1..6230626a320b1 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -416,6 +416,7 @@ print ''; print ''; print ''; +print ''; print ''; print ''; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 85fa0f640e9ce..064281633c827 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -468,6 +468,7 @@ print ''; print ''; print ''; + print ''; print ''; $title=$langs->trans("ListOfTasks"); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 8c9f56f1d949d..1f2459e85dbdf 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -412,6 +412,7 @@ print ''; print ''; print ''; +print ''; print ''; print ''; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index ddbd59ed11ff6..cbdfece9d4541 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -707,7 +707,8 @@ else print ''; print ''; print ''; - + print ''; + print ''; print ''; print ''; diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index c0b58523994b5..f8a1fb6be6127 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -187,6 +187,7 @@ print ''; print ''; print ''; +print ''; print ''; $moreforfilter = ''; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 4670036d70be8..40ca07783c4e8 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -547,6 +547,7 @@ print ''; print ''; print ''; +print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index b17ea678853f6..7e7648db71218 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -454,6 +454,7 @@ print ''; print ''; print ''; + print ''; print ''; // List of active notifications diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index c5f994f8a103d..2c10e2451a699 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -410,6 +410,7 @@ print ''; print ''; print ''; + print ''; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 6956a1ad5ebee..38fdf68b2baba 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -131,6 +131,7 @@ print ''; print ''; print ''; + print ''; print ''; print ''; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 04acb9b56f766..4cec562ce4476 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -296,6 +296,7 @@ print ''; print ''; print ''; +print ''; print ''; print ''; diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 3c186ac3cae28..e39d8153cacca 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -435,6 +435,7 @@ print ''; print ''; print ''; + print ''; print ''; // List of notifications done