浏览代码

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

Conflicts:
	htdocs/compta/facture/card.php
Laurent Destailleur 6 年之前
父节点
当前提交
0827929ede
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 1 1
      htdocs/compta/facture/card.php
  2. 3 2
      htdocs/societe/checkvat/checkVatPopup.php

+ 1 - 1
htdocs/compta/facture/card.php

@@ -4560,7 +4560,7 @@ elseif ($id > 0 || ! empty($ref))
 				}
 				}
 				else
 				else
 				{
 				{
-					print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInAccounting") . '">' . $langs->trans('Modify') . '</span></div>';
+					print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInBookkeeping") . '">' . $langs->trans('Modify') . '</span></div>';
 				}
 				}
 			}
 			}
 
 

+ 3 - 2
htdocs/societe/checkvat/checkVatPopup.php

@@ -40,8 +40,7 @@ $conf->dol_hide_leftmenu=1;
 
 
 llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
 llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
 
 
-print '<div>';
-print '<div>';
+print '<div class="vatcheckarea" style="margin-bottom: 10px">';
 
 
 print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup');
 print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup');
 
 
@@ -174,6 +173,8 @@ if ($messagetoshow)
 	print nl2br($messagetoshow);
 	print nl2br($messagetoshow);
 }
 }
 
 
+print '</div>';
+
 // End of page
 // End of page
 llxFooter();
 llxFooter();
 $db->close();
 $db->close();