lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix responsive and title of reports

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-30 17:42:49 +02:00
parent d94d7a1d0b
commit 0d4f7cb485
14 changed files with 231 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/sms.php
View File

@ -300,12 +300,12 @@ if ($action == 'edit')
$formsms = new FormSms($db); $formsms = new FormSms($db);
$formsms->fromtype = 'user'; $formsms->fromtype = 'user';
$formsms->fromid = $user->id; $formsms->fromid = $user->id;
$formsms->fromsms = (isset($_POST['fromsms']) ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile)); $formsms->fromsms = (GETPOSTISSET('fromsms') ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
$formsms->withfromreadonly = 0; $formsms->withfromreadonly = 0;
$formsms->withsubstit = 0; $formsms->withsubstit = 0;
$formsms->withfrom = 1; $formsms->withfrom = 1;
$formsms->withto = (isset($_POST['sendto']) ? $_POST['sendto'] : $user->user_mobile ? $user->user_mobile : 1); $formsms->withto = (GETPOSTISSET('sendto') ? $_POST['sendto'] : ($user->user_mobile ? $user->user_mobile : 1));
$formsms->withbody = (isset($_POST['message']) ? (empty($_POST['message']) ? 1 : $_POST['message']) : $langs->trans("ThisIsATestMessage")); $formsms->withbody = (GETPOSTISSET('message') ? (empty($_POST['message']) ? 1 : $_POST['message']) : $langs->trans("ThisIsATestMessage"));
$formsms->withbodyreadonly = 0; $formsms->withbodyreadonly = 0;
$formsms->withcancel = 1; $formsms->withcancel = 1;
// Tableau des substitutions // Tableau des substitutions

24
htdocs/compta/localtax/clients.php
View File

@ -88,7 +88,7 @@ if (empty($local))
} }
$calc = 0;
/* /*
* View * View
*/ */
@ -120,11 +120,11 @@ $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
if ($calc == 0 || $calc == 1) // Calculate on invoice for goods and services if ($calc == 0 || $calc == 1) // Calculate on invoice for goods and services
{ {
$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec"); $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded"); if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
$description .= $fsearch; $description .= $fsearch;
$description .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')'; $description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
$builddate = dol_now(); $builddate = dol_now();
$elementcust = $langs->trans("CustomersInvoices"); $elementcust = $langs->trans("CustomersInvoices");
@ -137,11 +137,11 @@ if ($calc == 0 || $calc == 1) // Calculate on invoice for goods and services
if ($calc == 2) // Invoice for goods, payment for services if ($calc == 2) // Invoice for goods, payment for services
{ {
$calcmode = $langs->trans("CalcModeLT2Debt"); $calcmode = $langs->trans("CalcModeLT2Debt");
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded"); if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
$description .= $fsearch; $description .= $fsearch;
$description .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')'; $description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
$builddate = dol_now(); $builddate = dol_now();
$elementcust = $langs->trans("CustomersInvoices"); $elementcust = $langs->trans("CustomersInvoices");
@ -157,10 +157,12 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
$vatcust = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code); $vatcust = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code);
$vatsup = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code); $vatsup = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code);
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">';
// IRPF that the customer has retained me // IRPF that the customer has retained me
if ($calc == 0 || $calc == 2) if ($calc == 0 || $calc == 2)
{ {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="left">'.$langs->trans("Num").'</td>'; print '<td class="left">'.$langs->trans("Num").'</td>';
print '<td class="left">'.$langs->trans("Customer").'</td>'; print '<td class="left">'.$langs->trans("Customer").'</td>';
@ -235,7 +237,6 @@ if ($calc == 0 || $calc == 2)
// IRPF I retained my supplier // IRPF I retained my supplier
if ($calc == 0 || $calc == 1) { if ($calc == 0 || $calc == 1) {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="left">'.$langs->trans("Num")."</td>"; print '<td class="left">'.$langs->trans("Num")."</td>";
print '<td class="left">'.$langs->trans("Supplier")."</td>"; print '<td class="left">'.$langs->trans("Supplier")."</td>";
@ -291,8 +292,6 @@ if ($calc == 0 || $calc == 1) {
print '<td class="nowrap right">'.price($totalamount).'</td>'; print '<td class="nowrap right">'.price($totalamount).'</td>';
print '<td class="nowrap right">'.price($total).'</td>'; print '<td class="nowrap right">'.price($total).'</td>';
print '</tr>'; print '</tr>';
print '</table>';
} else { } else {
$langs->load("errors"); $langs->load("errors");
if ($coll_list == -1) if ($coll_list == -1)
@ -305,15 +304,18 @@ if ($calc == 0 || $calc == 1) {
if ($calc == 0) { if ($calc == 0) {
// Total to pay // Total to pay
print '<br><br>'; print '<tr><td colspan="5"></td></tr>';
print '<table class="noborder centpercent">';
$diff = $x_coll_sum - $x_paye_sum; $diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>'; print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n"; print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
print "</tr>\n"; print "</tr>\n";
} }
print '</table>'; print '</table>';
print '</div>';
// End of page // End of page
llxFooter(); llxFooter();

4
htdocs/compta/localtax/index.php
View File

@ -227,10 +227,10 @@ $fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
$description = $fsearch; $description = $fsearch;
// Show report header // Show report header
$name = $langs->trans("ReportByMonth"); $name = $langs->transcountry($localTaxType == 1 ? "LT1ReportByMonth" : "LT2ReportByMonth", $mysoc->country_code);
$description .= $langs->trans($LT); $description .= $langs->trans($LT);
$calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' '; $calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' ';
$calcmode .= '('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')<br>'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
//if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue"); //if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");

20
htdocs/compta/localtax/quadri_detail.php
View File

@ -134,7 +134,7 @@ $calcmode = '';
if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault'); if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption'); if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices'); if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
// Set period // Set period
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$prevyear = $year_start; $prevyear = $year_start;
@ -200,12 +200,13 @@ if ($local == 1) {
} }
// VAT Received and paid // VAT Received and paid
print '<div class="div-table-responsive">';
echo '<table class="noborder centpercent">'; echo '<table class="noborder centpercent">';
$y = $year_current; $y = $year_current;
$total = 0; $total = 0;
$i = 0; $i = 0;
$columns = 5; $columns = 4;
// Load arrays of datas // Load arrays of datas
$x_coll = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell'); $x_coll = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
@ -310,8 +311,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
$x_paye_sum = 0; $x_paye_sum = 0;
$x_paye_ht = 0; $x_paye_ht = 0;
$span = $columns; $span = $columns - 1;
if ($modetax != 1) $span += 2; if ($modetax != 2) $span += 1;
if ($modetax != 1) $span += 1;
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -467,10 +469,10 @@ if (!is_array($x_coll) || !is_array($x_paye))
// Blank line // Blank line
print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>'; print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
print '</table>'; //print '</table>';
$diff = $x_coll_sum; $diff = $x_coll_sum;
echo '<table class="noborder centpercent">'; //echo '<table class="noborder centpercent">';
//print table headers for this quadri - expenses now //print table headers for this quadri - expenses now
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
@ -617,11 +619,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
print '</tr>'; print '</tr>';
} }
print '</table>';
// Total to pay // Total to pay
print '<br><br>';
print '<table class="noborder centpercent">';
$diff = $x_coll_sum - $x_paye_sum; $diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>'; print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
@ -630,7 +628,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
$i++; $i++;
} }
print '</table>'; print '</table>';
print '</div>';
// End of page // End of page
llxFooter(); llxFooter();

15
htdocs/compta/tva/clients.php
View File

@ -124,6 +124,7 @@ $product_static = new Product($db);
$payment_static = new Paiement($db); $payment_static = new Paiement($db);
$paymentfourn_static = new PaiementFourn($db); $paymentfourn_static = new PaiementFourn($db);
$paymentexpensereport_static = new PaymentExpenseReport($db); $paymentexpensereport_static = new PaymentExpenseReport($db);
$user_static = new User($db);
$morequerystring = ''; $morequerystring = '';
$listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday'); $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
@ -151,7 +152,7 @@ $calcmode = '';
if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault'); if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption'); if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices'); if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
// Set period // Set period
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$prevyear = $year_start; $prevyear = $year_start;
@ -216,7 +217,7 @@ $vatsup = $langs->trans("VATPaid");
// VAT Received // VAT Received
print '<div class="div-table-responsive">';
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
$y = $year_current; $y = $year_current;
@ -743,14 +744,12 @@ if (!is_array($x_coll) || !is_array($x_paye))
print '</tr>'; print '</tr>';
} }
print '</table>';
// Total to pay // Total to pay
print '<br><br>'; print '<tr><td colspan="'.($span+2).'"></td></tr>';
print '<table class="noborder centpercent">';
$diff = $x_coll_sum - $x_paye_sum; $diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>'; print '<td class="liste_total" colspan="'.($span+1).'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n"; print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
print "</tr>\n"; print "</tr>\n";
@ -758,7 +757,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
} }
print '</table>'; print '</table>';
print '</div>';
llxFooter(); llxFooter();

4
htdocs/compta/tva/index.php
View File

@ -220,12 +220,12 @@ $fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
$description = $fsearch; $description = $fsearch;
// Show report header // Show report header
$name = $langs->trans("ReportByMonth"); $name = $langs->trans("VATReportByMonth");
$calcmode = ''; $calcmode = '';
if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault'); if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption'); if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices'); if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
$description .= $langs->trans("VATSummary").'<br>'; $description .= $langs->trans("VATSummary").'<br>';
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts"); if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");

4
htdocs/compta/tva/quadri_detail.php
View File

@ -152,7 +152,7 @@ $calcmode = '';
if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault'); if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption'); if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices'); if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')'; $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
// Set period // Set period
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$prevyear = $year_start; $prevquarter = $q; $prevyear = $year_start; $prevquarter = $q;
@ -213,6 +213,7 @@ $vatexpensereport = $langs->trans("VATPaid");
// VAT Received and paid // VAT Received and paid
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
$y = $year_current; $y = $year_current;
@ -719,6 +720,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
} }
print '</table>'; print '</table>';
print '</div>';
// Total to pay // Total to pay
print '<br><br>'; print '<br><br>';

4
htdocs/core/lib/report.lib.php
View File

@ -69,7 +69,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
// Ligne de titre // Ligne de titre
print '<tr>'; print '<tr>';
print '<td width="110">'.$langs->trans("ReportName").'</td>'; print '<td width="150">'.$langs->trans("ReportName").'</td>';
print '<td>'; print '<td>';
print $reportname; print $reportname;
print '</td>'; print '</td>';
@ -80,7 +80,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
if ($calcmode) if ($calcmode)
{ {
print '<tr>'; print '<tr>';
print '<td width="110">'.$langs->trans("CalculationMode").'</td>'; print '<td width="150">'.$langs->trans("CalculationMode").'</td>';
print '<td>'; print '<td>';
print $calcmode; print $calcmode;
if ($variante) print '<td></td>'; if ($variante) print '<td></td>';

3
htdocs/langs/en_US/compta.lang
View File

@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
SeePageForSetup=See menu <a href="%s">%s</a> for setup SeePageForSetup=See menu <a href="%s">%s</a> for setup
DepositsAreNotIncluded=- Down payment invoices are not included DepositsAreNotIncluded=- Down payment invoices are not included
DepositsAreIncluded=- Down payment invoices are included DepositsAreIncluded=- Down payment invoices are included
LT1ReportByMonth=Tax 2 report by month
LT2ReportByMonth=Tax 3 report by month
LT1ReportByCustomers=Report tax 2 by third party LT1ReportByCustomers=Report tax 2 by third party
LT2ReportByCustomers=Report tax 3 by third party LT2ReportByCustomers=Report tax 3 by third party
LT1ReportByCustomersES=Report by third party RE LT1ReportByCustomersES=Report by third party RE
LT2ReportByCustomersES=Report by third party IRPF LT2ReportByCustomersES=Report by third party IRPF
VATReport=Sale tax report VATReport=Sale tax report
VATReportByPeriods=Sale tax report by period VATReportByPeriods=Sale tax report by period
VATReportByMonth=Sale tax report by month
VATReportByRates=Sale tax report by rates VATReportByRates=Sale tax report by rates
VATReportByThirdParties=Sale tax report by third parties VATReportByThirdParties=Sale tax report by third parties
VATReportByCustomers=Sale tax report by customer VATReportByCustomers=Sale tax report by customer

12
htdocs/theme/eldy/btn.inc.php
View File

@ -112,18 +112,6 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
padding-left: 0px; padding-left: 0px;
} }
/*a.butActionNew>span.fa-plus-circle, a.butActionNew>span.fa-plus-circle:hover,
span.butActionNew>span.fa-plus-circle, span.butActionNew>span.fa-plus-circle:hover,
a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-circle:hover,
span.butActionNewRefused>span.fa-plus-circle, span.butActionNewRefused>span.fa-plus-circle:hover,
a.butActionNew>span.fa-list-alt, a.butActionNew>span.fa-list-alt:hover,
span.butActionNew>span.fa-list-alt, span.butActionNew>span.fa-list-alt:hover,
a.butActionNewRefused>span.fa-list-alt, a.butActionNewRefused>span.fa-list-alt:hover,
span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list-alt:hover,
a.butActionNew>span.fa-comment-dots, a.butActionNew>span.fa-comment-dots:hover,
span.butActionNew>span.fa-comment-dots, span.butActionNew>span.fa-comment-dots:hover,
a.butActionNewRefused>span.fa-comment-dots, a.butActionNewRefused>span.fa-comment-dots:hover,
span.butActionNewRefused>span.fa-comment-dots, span.butActionNewRefused>span.fa-comment-dots:hover,*/
a.butActionNew>span.fa, a.butActionNew>span.fa:hover, a.butActionNew>span.fa, a.butActionNew>span.fa:hover,
span.butActionNew>span.fa, span.butActionNew>span.fa:hover, span.butActionNew>span.fa, span.butActionNew>span.fa:hover,
a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover, a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover,

3
htdocs/theme/eldy/global.inc.php
View File

@ -4074,6 +4074,7 @@ div.titre {
text-decoration: none; text-decoration: none;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
text-transform: capitalize;
} }
div.fiche > table.table-fiche-title:first-of-type div { div.fiche > table.table-fiche-title:first-of-type div {
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
@ -4081,10 +4082,10 @@ div.fiche > table.table-fiche-title:first-of-type div {
/* text-transform: uppercase; */ /* text-transform: uppercase; */
/* font-weight: 600; */ /* font-weight: 600; */
} }
div.titre { div.titre {
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
} }
.secondary { .secondary {
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
} }

50
htdocs/theme/md/badges.inc.php
View File

@ -26,6 +26,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
font-size: 1em; font-size: 1em;
padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */
} }
.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
font-size: 1.1em;
padding: .4em .4em;
}
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
{
.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
font-size: 0.95em;
padding: .3em .2em;
}
}
.badge-pill, .tabs .badge { .badge-pill, .tabs .badge {
padding-right: .5em; padding-right: .5em;
@ -36,7 +48,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.badge-dot { .badge-dot {
padding: 0; padding: 0;
border-radius: 50%; border-radius: 50%;
padding: 0.35em; padding: 0.45em;
vertical-align: unset; vertical-align: unset;
} }
@ -120,6 +132,17 @@ a.badge-warning:focus, a.badge-warning:hover {
background-color: <?php print colorDarker($badgeWarning, 10); ?>; background-color: <?php print colorDarker($badgeWarning, 10); ?>;
} }
/* WARNING colorblind */
body[class*="colorblind-"] .badge-warning {
background-color: <?php print $colorblind_deuteranopes_badgeWarning; ?>;
}
body[class*="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($colorblind_deuteranopes_badgeWarning, 0.5); ?>;
}
body[class*="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
background-color: <?php print colorDarker($colorblind_deuteranopes_badgeWarning, 10); ?>;
}
/* INFO */ /* INFO */
.badge-info { .badge-info {
color: #fff !important; color: #fff !important;
@ -163,10 +186,9 @@ a.badge-dark:focus, a.badge-dark:hover {
} }
/* /* STATUS BADGES */
* STATUS BADGES <?php
*/ for ($i = 0; $i <= 9; $i++) {
<?php for ($i = 0; $i <= 9; $i++) {
/* Default Status */ /* Default Status */
_createStatusBadgeCss($i, '', "STATUS".$i); _createStatusBadgeCss($i, '', "STATUS".$i);
@ -174,6 +196,9 @@ a.badge-dark:focus, a.badge-dark:hover {
_createStatusBadgeCss($i, 'colorblind_deuteranopes_', "COLORBLIND STATUS".$i, 'body[class*="colorblind-"] '); _createStatusBadgeCss($i, 'colorblind_deuteranopes_', "COLORBLIND STATUS".$i, 'body[class*="colorblind-"] ');
} }
_createStatusBadgeCss('1b', '', "STATUS1b");
_createStatusBadgeCss('4b', '', "STATUS4b");
/** /**
* Create status badge * Create status badge
* *
@ -190,27 +215,28 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) { if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
print "\n/* ".strtoupper($commentLabel)." */\n"; print "\n/* ".strtoupper($commentLabel)." */\n";
$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName}; $thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName};
$TBadgeBorderOnly = array(0, 3, 5, 7); $TBadgeBorderOnly = array('0', '1b', '3', '4b', '5', '7');
$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff'; $thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff';
if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) { if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) {
$thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName}; $thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
} }
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array((string) $statusName, $TBadgeBorderOnly)) {
$thisBadgeTextColor = '#212529'; $thisBadgeTextColor = '#212529';
$thisBadgeBackgroundColor = "#fff"; $thisBadgeBackgroundColor = "#fff";
} }
if (in_array($statusName, array(0, 5, 9))) $thisBadgeTextColor = '#999999'; if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999';
if (in_array($statusName, array(6))) $thisBadgeTextColor = '#777777'; if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777';
print $cssPrefix.".badge-status".$statusName." {\n"; print $cssPrefix.".badge-status".$statusName." {\n";
print " color: ".$thisBadgeTextColor." !important;\n"; print " color: ".$thisBadgeTextColor." !important;\n";
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array((string) $statusName, $TBadgeBorderOnly)) {
print " border-color: ".$thisBadgeBorderColor.";\n"; print " border-color: ".$thisBadgeBorderColor.";\n";
} }
print " background-color: ".$thisBadgeBackgroundColor.";\n"; print " background-color: ".$thisBadgeBackgroundColor.";\n";
@ -227,8 +253,8 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n"; print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
print " color: ".$thisBadgeTextColor." !important;\n"; print " color: ".$thisBadgeTextColor." !important;\n";
print " background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n"; //print " background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array((string) $statusName, $TBadgeBorderOnly)) {
print " border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n"; print " border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
} }
print "}\n"; print "}\n";

169
htdocs/theme/md/btn.inc.php
View File

@ -2,7 +2,40 @@
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
:root {
--btncolortext:rgb(<?php print $colortextlink; ?>);
--btncolorbg: #fbfbfb;
--btncolorborderhover: none;
--btncolorborder: #FFF;
--butactiondeletebg: rgb(234,228,225);
/* tertiary color */
/* --butactionbg:rgb(218, 235, 225); */
/* --butactionbg:rgb(228, 218, 235); */
--butactionbg:rgb(118, 145, 225);
}
<?php
if (!empty($conf->global->THEME_DARKMODEENABLED)) {
print "/* For dark mode */\n";
if ($conf->global->THEME_DARKMODEENABLED != 2) {
print "@media (prefers-color-scheme: dark) {";
}
print "
:root {
--btncolortext: ;
--btncolorbg: rgb(26,27,27);
--btncolorborderhover: #ffffff;
--btncolorborder: #2b2c2e;
--butactionbg:rgb(173,140,79);
--butactiondeletebg: rgb(252,84,91);
}\n";
if ($conf->global->THEME_DARKMODEENABLED != 2) {
print "}";
}
}
?>
/* ============================================================================== */ /* ============================================================================== */
/* Buttons for actions */ /* Buttons for actions */
@ -11,19 +44,61 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
div.divButAction { div.divButAction {
margin-bottom: 1.4em; margin-bottom: 1.4em;
vertical-align: top;
} }
div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete, div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete { div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete {
margin-bottom: 1.4em !important; margin-bottom: 1.4em !important;
} }
div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused {
margin-bottom: 0 !important;
}
span.butAction, span.butActionDelete { span.butAction, span.butActionDelete {
cursor: pointer; cursor: pointer;
} }
.butAction {
background: var(--butactionbg);
color: #FFF !important;
border-radius: 3px;
/* background: rgb(230, 232, 239); */
}
.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
text-decoration: none;
text-transform: uppercase;
font-weight: bold;
.button, .buttonDelete, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused { margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
font-family: <?php print $fontlist ?>;
display: inline-block;
text-align: center;
cursor: pointer;
/* color: #fff; */
/* background: rgb(<?php echo $colorbackhmenu1 ?>); */
color: #444;
/* border: 1px solid #aaa; */
/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
/*border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
border-top-left-radius: 0 !important;
border-bottom-left-radius: 0 !important;*/
}
.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
text-decoration: none;
text-transform: uppercase;
font-weight: normal;
margin: 0em 0.3em 0 0.3em !important;
padding: 0.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em 0.3em;
font-family: <?php print $fontlist ?>;
display: inline-block;
/* text-align: center; New button are on right of screen */
cursor: pointer;
}
.button {
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block; display: inline-block;
padding: 0.4em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em; padding: 0.4em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
@ -92,7 +167,7 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
padding-left: 0px; padding-left: 0px;
} }
.button, .butAction { .button {
color: #ffffff !important; color: #ffffff !important;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc; background-color: #006dcc;
@ -105,7 +180,7 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
border-color: #0044cc #0044cc #002a80; border-color: #0044cc #0044cc #002a80;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
} }
.button:disabled, .butAction:disabled { .button:disabled {
color: #666 !important; color: #666 !important;
text-shadow: none; text-shadow: none;
border-color: #555; border-color: #555;
@ -124,37 +199,73 @@ button.ui-button {
padding-top: 5px; padding-top: 5px;
} }
.butActionDelete, .buttonDelete { a.butActionNew>span.fa, a.butActionNew>span.fa:hover,
color: #ffffff !important; span.butActionNew>span.fa, span.butActionNew>span.fa:hover,
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover,
background-color: #cc6d00; span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
background-image: -moz-linear-gradient(top, #cc8800, #cc4400); {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400)); padding-<?php echo $left; ?>: 6px;
background-image: -webkit-linear-gradient(top, #cc8800, #cc4400); font-size: 1.5em;
background-image: -o-linear-gradient(top, #cc8800, #cc4400); border: none;
background-image: linear-gradient(to bottom, #cc8800, #cc4400); box-shadow: none; webkit-box-shadow: none;
background-repeat: repeat-x;
border-color: #cc4400 #cc4400 #802a00;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
color: #FFFFFF;
} }
.butActionRefused, .butActionNewRefused { .butAction:hover {
color: #AAAAAA !important; -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
cursor: not-allowed !important; box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
}
.butActionNew:hover {
text-decoration: underline;
box-shadow: unset !important;
} }
a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover { .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
text-decoration: none; background: var(--butactiondeletebg);
/* border: 1px solid #633; */
color: #633;
} }
a.butActionNewRefused:hover {
border-color: unset !important; .butActionDelete:hover {
border: 1px solid #bbbbbb; -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
} }
a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
opacity: 0.9; .butActionRefused {
text-decoration: none !important;
text-transform: uppercase;
font-weight: bold !important;
white-space: nowrap !important;
cursor: not-allowed !important;
margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
font-family: <?php print $fontlist ?> !important;
display: inline-block;
text-align: center;
cursor: pointer;
color: #999 !important;
border: 1px solid #ccc;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active {
text-decoration: none !important;
text-transform: uppercase;
font-weight: normal !important;
white-space: nowrap !important;
cursor: not-allowed !important;
margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
padding: 0.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
font-family: <?php print $fontlist ?> !important;
display: inline-block;
/* text-align: center; New button are on right of screen */
cursor: pointer;
color: #999 !important;
padding-top: 0.2em;
box-shadow: none !important;
-webkit-box-shadow: none !important;
} }
.butActionTransparent { .butActionTransparent {

6
htdocs/theme/md/style.css.php
View File

@ -3933,10 +3933,14 @@ div.titre {
text-decoration: none; text-decoration: none;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
text-transform: uppercase;
/* text-shadow: 1px 1px 2px #FFFFFF; */ /* text-shadow: 1px 1px 2px #FFFFFF; */
<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?> <?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
} }
.secondary, div.titre { div.titre {
color: var(--colortexttitlenotab);
}
.secondary {
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
} }
.tertiary { .tertiary {