diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index acb69a87f41..d1bc884b937 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -159,7 +159,7 @@ $usercanclose = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empt $usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate'))); $usercancancel = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'annuler'))); $usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'send')); -$usercangeneretedoc = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc')); +$usercangeneratedoc = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc')); $usermustrespectpricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('produit', 'ignore_price_min_advance')) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')); $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer')); diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index e3295f5e192..e8d7cf868dd 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -58,7 +58,7 @@ if (!empty($permissioncreate) && empty($permissiontoadd)) { } // Build doc -if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneretedoc))) { +if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneratedoc))) { if (is_numeric(GETPOST('model', 'alpha'))) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")), null, 'errors'); } else { diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index a688de7ea1c..f2e2001a915 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -71,7 +71,6 @@ EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ? ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ? NoClientErrorMessage=Please select a customer first -History=History ValidateAndClose=Validate and close Terminal=Terminal NumberOfTerminals=Number of Terminals diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a3591687704..99d3d3ff5ac 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1425,3 +1425,4 @@ SignatureID=Signature except=except DUPLICATA=DUPLICATA ErrorFailedTriggerCall=Failed to call trigger +History=History diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 96e98f98df8..087eff8637e 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -5,7 +5,6 @@ SupplierInvoices=Vendor invoices ShowSupplierInvoice=Show Vendor Invoice NewSupplier=New vendor NewSupplierInvoice = New vendor invoice -History=History ListOfSuppliers=List of vendors ShowSupplier=Show vendor BuyingPriceMin=Best buying price diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 5610767971f..4854c7fdded 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4236,7 +4236,7 @@ div.popuptab { /* ============================================================================== */ div.tabsAction { - margin: 20px 0em 30px 0em; + margin: 20px 0em 40px 0em; padding: 0em 0em; text-align: right; }