diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 17c1414106e..b546cf235fb 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -414,9 +414,9 @@ if ($action == 'edit' || $action == 'updateedit') // Forme juridique $var=!$var; - print ''; + print ''; if ($mysoc->country_code) { - print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'legal_form'); + print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code'); } else { print $countrynotdefined; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index d88f72f171e..a32ec3384ee 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -191,7 +191,7 @@ if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcusto if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1); if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1); -if ($search_status != '') $sql.= " AND f.fk_statut = '".$db->escape($search_status)."'"; +if ($search_status >= 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status); if ($month > 0) { if ($year > 0 && empty($day)) diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 0625dd4978d..9a7166b7892 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -100,6 +100,10 @@ if ($user->societe_id) { } $result = restrictedArea($user, 'tax', '', '', 'charges'); +// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') +$modecompta = $conf->global->ACCOUNTING_MODE; +if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); + /* @@ -292,7 +296,14 @@ if (is_array($coll_list)) { } else { $langs->load("errors"); if ($coll_list == -1) { - print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + if ($modecompta == 'CREANCES-DETTES') + { + print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + } + else + { + print '' . $langs->trans("FeatureNotYetAvailable") . ''; + } } else if ($coll_list == -2) { print '' . $langs->trans("FeatureNotYetAvailable") . ''; } else { @@ -377,7 +388,14 @@ if (is_array($coll_list)) { } else { $langs->load("errors"); if ($coll_list == -1) { - print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + if ($modecompta == 'CREANCES-DETTES') + { + print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + } + else + { + print '' . $langs->trans("FeatureNotYetAvailable") . ''; + } } else if ($coll_list == -2) { print '' . $langs->trans("FeatureNotYetAvailable") . ''; } else { @@ -457,7 +475,14 @@ if ($special_report) { } else { $langs->load("errors"); if ($coll_list == -1) { - print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + if ($modecompta == 'CREANCES-DETTES') + { + print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + } + else + { + print '' . $langs->trans("FeatureNotYetAvailable") . ''; + } } else { if ($coll_list == -2) { print '' . $langs->trans("FeatureNotYetAvailable") . ''; @@ -530,7 +555,14 @@ if ($special_report) { } else { $langs->load("errors"); if ($coll_list == -1) { - print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + if ($modecompta == 'CREANCES-DETTES') + { + print '' . $langs->trans("ErrorNoAccountancyModuleLoaded") . ''; + } + else + { + print '' . $langs->trans("FeatureNotYetAvailable") . ''; + } } else { if ($coll_list == -2) { print '' . $langs->trans("FeatureNotYetAvailable") . ''; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 8beae962d09..5ee6657841a 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1743,7 +1743,7 @@ function pdf_getLinkedObjects($object,$outputlangs) else // We show both info of order and shipment { $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); - $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending"); $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index b2b99d34d3b..2387332e670 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -79,7 +79,7 @@ function tax_prepare_head(ChargeSociales $object) * @param int $y Year * @param string $date_start Start date * @param string $date_end End date - * @param int $modetax 0 or 1 (option vat on debit) + * @param int $modetax 0 or 1 (option vat on debit, 1 => $modecompta = 'CREANCES-DETTES') * @param string $direction 'sell' or 'buy' * @param int $m Month * @return array List of customers third parties with vat, -1 if no accountancy module, -2 if not yet developped, -3 if error diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index a4faa746c8e..6ac8b877ad6 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -114,7 +114,23 @@ class modProjet extends DolibarrModules $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/tasks"; $this->const[$r][3] = ""; $this->const[$r][4] = 0; - + $r++; + + $this->const[$r][0] = "PROJECT_USE_OPPORTUNIES"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "1"; + $this->const[$r][3] = ""; + $this->const[$r][4] = 0; + $r++; + + /* not required (0 = not present) + $this->const[$r][0] = "PROJECT_HIDE_TASKS"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "0"; + $this->const[$r][3] = ""; + $this->const[$r][4] = 0; + */ + // Boxes $this->boxes = array(); $r=0; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 24968839960..a3343f88e16 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -466,6 +466,7 @@ if ($action == 'create' && $user->rights->projet->creer) print $form->textwithtooltip($text.' '.img_help(),$texthelp,1); } else print $text; + print ' '.$langs->trans("AddThirdParty").''; print ''; // Status diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 97adcf008a1..771c8aa87e8 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1203,11 +1203,11 @@ else print ''; // Legal Form - print ''.fieldLabel('JuridicalStatus','legal_form').''; + print ''.fieldLabel('JuridicalStatus','forme_juridique_code').''; print ''; if ($object->country_id) { - print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'legal_form'); + print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code'); } else { @@ -1786,8 +1786,8 @@ else print ''; // Juridical type - print ''.fieldLabel('JuridicalStatus','legal_form').''; - print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'legal_form'); + print ''.fieldLabel('JuridicalStatus','forme_juridique_code').''; + print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code'); print ''; // Capital diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 80f64e41561..591feac5fca 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -320,6 +320,7 @@ th .button { } .center { text-align: center; + margin: 0px auto; } .left { text-align: ; @@ -458,6 +459,10 @@ div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */ body.body center { color:white; margin-top: 100px; } +.login_vertical_align { + padding: 10px; +} + form#login { border:solid 1px rgba(0,0,0,.4); border-top:solid 1px #ffffff; @@ -515,6 +520,10 @@ form#login table.login_table { background:none !important; } +.login_main_message { + text-align: center; +} + div#login_left, div#login_right { display: inline-block; min-width: 220px; @@ -522,7 +531,7 @@ div#login_left, div#login_right { vertical-align: middle; } -table.login_table { background-color: red !important;} +table.login_table { margin: 0px auto; background-color: red !important;} table.login_table tr td {vertical-align:middle;} table.login_table tr.vmenu td {font-size:18px;} table.login_table tr td a {color:#333333 !important;} diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index d1dd0ab4091..5e2af9e2eb2 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -226,6 +226,7 @@ div.floatright } .center { text-align: center; + margin: 0px auto; } .left { text-align: ; @@ -542,7 +543,9 @@ foreach($mainmenuusedarray as $val) /* Login */ - +.login_vertical_align { + padding: 10px; +} form#login { margin-top: px; margin-bottom: 30px; @@ -557,9 +560,8 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { - padding:12px; - margin-left: 10px; - margin-right: 10px; + padding: 12px; + margin: 0px auto; /* Center */ max-width: 540px; border: 1px solid #C0C0C0; background-color: #E0E0E0; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index eee7afcb9c0..f74326d908d 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -251,6 +251,7 @@ div.floatright } .center { text-align: center; + margin: 0px auto; } .left { text-align: ; @@ -566,15 +567,19 @@ li.tmenu a.tmenudisabled { /* Login */ - +.login_vertical_align { + padding: 10px; +} +.login_main_message { + text-align: center; +} form#login { margin-top: px; margin-bottom: 30px; font-size: 13px; } .login_table_title { - margin-left: 10px; - margin-right: 10px; + margin: 0px auto; max-width: 540px; color: #888888; text-shadow: 1px 1px 1px #FFF; @@ -583,8 +588,7 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { - margin-left: 10px; - margin-right: 10px; + margin: 0px auto; /* Center */ padding:12px; max-width: 540px; border: 1px solid #C0C0C0; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 4b8955953bd..0fcecf98e32 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -227,6 +227,7 @@ div.floatright } .center { text-align: center; + margin: 0px auto; } .left { text-align: ; @@ -637,7 +638,12 @@ foreach($mainmenuusedarray as $val) /* Login */ - +.login_vertical_align { + padding: 10px; +} +.login_main_message { + text-align: center; +} form#login { margin-top: px; margin-bottom: 30px; @@ -652,8 +658,7 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { - margin-left: 10px; - margin-right: 10px; + margin: 0px auto; /* Center */ padding:12px; max-width: 540px; border: 1px solid #C0C0C0; diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index bd70786dab4..fb84b7341e1 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -401,6 +401,7 @@ textarea.centpercent { } .center { text-align: center; + margin: 0px auto; } .left { text-align: ; @@ -598,8 +599,8 @@ div.ficheaddleft { else print "margin-top: 10px;\n"; ?> } .containercenter { -display : table; -margin : 0px auto; + display : table; + margin : 0px auto; } #pictotitle { @@ -912,8 +913,7 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { - margin-left: 10px; - margin-right: 10px; + margin: 0px auto; /* Center */ padding-left:6px; padding-right:6px; padding-top:16px;