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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-16 22:59:52 +01:00
commit a32bafe406
13 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/exe/doliwamp/index.php.install
View File

@ -527,7 +527,7 @@ a:hover {
</head>
<body>
<table width="100%"><tr><td align="left">
<table width="100%"><tr><td class="left">
<img src="index.php?img=pngLogo">
</td>
<td align="right">
@ -587,4 +587,4 @@ a:hover {
EOPAGE;
echo $pageContents;
?>
?>

6
htdocs/accountancy/admin/fiscalyear.php
View File

@ -144,9 +144,9 @@ if ($result)
$fiscalyearstatic->id = $obj->rowid;
print '<tr class="oddeven">';
print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>';
print '<td align="left">' . $obj->label . '</td>';
print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
print '<td align="left">' . dol_print_date($db->jdate($obj->date_end), 'day') . '</td>';
print '<td class="left">' . $obj->label . '</td>';
print '<td class="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
print '<td class="left">' . dol_print_date($db->jdate($obj->date_end), 'day') . '</td>';
print '<td align="center">' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . '</td>';
print '<td align="center">' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . '</td>';
print '<td align="right">' . $fiscalyearstatic->LibStatut($obj->statut, 5) . '</td>';

4
htdocs/accountancy/admin/importaccounts.php
View File

@ -142,11 +142,11 @@ if ($result) {
$objp = $db->fetch_object($result);
print '<tr class="oddeven">';
print '<td align="left">';
print '<td class="left">';
print $objp->accounting;
print '</td>';
print '<td align="left">';
print '<td class="left">';
print '<input name="label" size="30" value="">';
print '</td>';

10
htdocs/accountancy/admin/productaccount.php
View File

@ -396,12 +396,12 @@ if ($result)
print $product_static->getNomUrl(1);
print '</td>';
print '<td align="left">'.$obj->label.'</td>';
print '<td class="left">'.$obj->label.'</td>';
if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC))
{
// TODO ADJUST DESCRIPTION SIZE
// print '<td align="left">' . $obj->description . '</td>';
// print '<td class="left">' . $obj->description . '</td>';
// TODO: we shoul set a user defined value to adjust user square / wide screen size
$trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($obj->description, $trunclengh)) . '</td>';
@ -414,7 +414,7 @@ if ($result)
print '<td align="center">'.$product_static->getLibStatut(3, 1).'</td>';
// Current accounting account
print '<td align="left">';
print '<td class="left">';
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
print length_accountg($obj->accountancy_code_buy);
if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
@ -430,7 +430,7 @@ if ($result)
$defaultvalue='';
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
// Accounting account buy
print '<td align="left">';
print '<td class="left">';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
if (empty($defaultvalue)) $defaultvalue=$compta_prodbuy;
$codesell=length_accountg($obj->accountancy_code_buy);
@ -439,7 +439,7 @@ if ($result)
print '</td>';
} else {
// Accounting account sell
print '<td align="left">';
print '<td class="left">';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
if (empty($defaultvalue)) $defaultvalue=$compta_prodsell;
$codesell=length_accountg($obj->accountancy_code_sell);

4
htdocs/accountancy/bookkeeping/list.php
View File

@ -751,8 +751,8 @@ if ($num > 0)
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totaldebitfield'] == $i) print '<td align="right">'.price($totalarray['totaldebit']).'</td>';
elseif ($totalarray['totalcreditfield'] == $i) print '<td align="right">'.price($totalarray['totalcredit']).'</td>';

4
htdocs/accountancy/customer/index.php
View File

@ -203,7 +203,7 @@ if ($resql) {
}
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
@ -280,7 +280,7 @@ if ($resql) {
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));

4
htdocs/accountancy/expensereport/index.php
View File

@ -195,7 +195,7 @@ if ($resql) {
}
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
@ -268,7 +268,7 @@ if ($resql) {
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));

2
htdocs/accountancy/expensereport/lines.php
View File

@ -325,7 +325,7 @@ if ($result) {
print '<td>' . $codeCompta . '</td>';
print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')). '">';
print '<td class="left"><a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')). '">';
print img_edit();
print '</a></td>';

4
htdocs/accountancy/supplier/index.php
View File

@ -195,7 +195,7 @@ if ($resql) {
}
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
@ -266,7 +266,7 @@ if ($resql) {
}
else print length_accountg($row[0]);
print '</td>';
print '<td align="left">';
print '<td class="left">';
if ($row[0] == 'tobind')
{
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));

5
htdocs/fichinter/card-rec.php
View File

@ -399,7 +399,6 @@ if ($action == 'create') {
print '<td align="center">'.$langs->trans("Duration").'</td>';
print "</tr>\n";
}
$var=true;
while ($i < $num) {
$objp = $db->fetch_object($result);
print '<tr class="oddeven">';
@ -543,9 +542,9 @@ if ($action == 'create') {
print '<tr><td>'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description)."</td></tr>";
// Contrat
// Contract
if (! empty($conf->contrat->enabled)) {
$langs->load('contrat');
$langs->load('contracts');
print '<tr>';
print '<td>';

4
htdocs/fichinter/card.php
View File

@ -1271,10 +1271,10 @@ else if ($id > 0 || ! empty($ref))
print '</td>';
print '</tr>';
// Contrat
// Contract
if ($conf->contrat->enabled)
{
$langs->load('contrat');
$langs->load('contracts');
print '<tr>';
print '<td>';

3
htdocs/reception/card.php
View File

@ -1013,7 +1013,6 @@ if ($action == 'create')
print "</tr>\n";
}
$var=true;
$indiceAsked =1;
while ($indiceAsked <= $numAsked)
{
@ -1192,7 +1191,7 @@ if ($action == 'create')
$line->fetch_optionals($object->id,$extralabelslines);
$line->array_options = array_merge($line->array_options, $srcLine->array_options);
print '<tr class="oddeven">';
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan),$indiceAsked);
print '</tr>';
}

1
htdocs/reception/list.php
View File

@ -791,7 +791,6 @@ if ($resql)
print "</tr>\n";
$i=0;
$var=true;
$totalarray=array();
while ($i < min($num,$limit))
{