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

Merge branch 'develop' into patch-2

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-19 13:04:52 +02:00 committed by GitHub
commit a0cd053206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 146 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,8 @@ if ($result)
if ($search_desc > 0) $param.="&search_desc=".urlencode($search_desc);
if ($search_current_account > 0) $param.="&search_current_account=".urlencode($search_current_account);
if ($search_current_account_valid && $search_current_account_valid != '-1') $param.="&search_current_account_valid=".urlencode($search_current_account_valid);
if ($accounting_product_mode) $param.='&accounting_product_mode='.urlencode($accounting_product_mode);
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

18
htdocs/accountancy/customer/list.php
View File

@ -421,6 +421,8 @@ if ($result) {
$facture_static = new Facture($db);
$product_static = new Product($db);
$isSellerInEEC = isInEEC($mysoc);
while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result);
@ -440,7 +442,7 @@ if ($result) {
$code_sell_p_notset = '';
$objp->aarowid_suggest = $objp->aarowid;
$isinEEC = isInEEC($objp->country_code);
$isBuyerInEEC = isInEEC($objp);
if ($objp->type_l == 1) {
$objp->code_sell_l = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
@ -455,15 +457,17 @@ if ($result) {
}
if ($objp->code_sell_l == -1) $objp->code_sell_l='';
if ($objp->country_sell == '1') {
if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
$objp->code_sell_p = $objp->code_sell;
$objp->aarowid_suggest = $objp->aarowid;
} elseif ($isinEEC === true) {
$objp->code_sell_p = $objp->code_sell_intra;
$objp->aarowid_suggest = $objp->aarowid_intra;
} else {
$objp->code_sell_p = $objp->code_sell_export;
$objp->aarowid_suggest = $objp->aarowid_export;
if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
$objp->code_sell_p = $objp->code_sell_intra;
$objp->aarowid_suggest = $objp->aarowid_intra;
} else { // Foreign sale
$objp->code_sell_p = $objp->code_sell_export;
$objp->aarowid_suggest = $objp->aarowid_export;
}
}
if (! empty($objp->code_sell)) {

10
htdocs/asset/list.php
View File

@ -295,6 +295,14 @@ if ($user->rights->asset->delete) $arrayofmassactions['predelete']='<span class=
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
$newcardbutton='';
if ($user->rights->asset->write)
{
$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/asset/card.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewAsset').'</span>';
$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
$newcardbutton.= '</a>';
}
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -305,7 +313,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
// Add code for pre mass action (confirmation or email presend form)
$topicmail="SendAssetsRef";

10
htdocs/asset/type.php
View File

@ -220,6 +220,14 @@ if (! $rowid && $action != 'create' && $action != 'edit')
$param = '';
$newcardbutton='';
if ($user->rights->asset->configurer)
{
$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/asset/type.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewAssetType').'</span>';
$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
$newcardbutton.= '</a>';
}
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -229,7 +237,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit);
$moreforfilter = '';

20
htdocs/core/menus/init_menu_auguria.sql
View File

@ -5,16 +5,16 @@
delete from llx_menu where menu_handler=__HANDLER__ and entity=__ENTITY__;
--
--
-- table llx_menu
--
--
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', 1__+MAX_llx_menu__, __HANDLER__, 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('facture|don|tax|salaries|loan|banque', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled || $conf->banque->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->rights->banque->lire', '', 2, 50, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 52, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|assets', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->accounting->assets', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'Accountancy', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->assets->read', '', 2, 54, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|asset', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->asset->enabled', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', -1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->asset->read', '', 2, 54, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__);
insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__);
@ -238,8 +238,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)', __HANDLER__, 'left', 2350__+MAX_llx_menu__, 'billing', 'tax_various', 2200__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'MenuVariousPayment', 1, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2351__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/card.php?mainmenu=billing&amp;leftmenu=tax_various&amp;action=create', 'New', 2, 'various_payment', '$user->rights->banque->modifier', '', 0, 2, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'List', 2, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
-- Accounting Expert
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accountancy', 9__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-- Accounting (Double entries)
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accountancy', 9__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', 0, 'main', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-- Setup
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin', 2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
@ -299,10 +299,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2715__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&amp;leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2716__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&amp;leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-- Assets
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->assets->enabled', __HANDLER__, 'left', 3000__+MAX_llx_menu__, 'accountancy', 'assets', 10__+MAX_llx_menu__, '/assets/list.php?mainmenu=accountancy&amp;leftmenu=assets', 'MenuAssets', 0, 'assets', '$user->rights->assets->read', '', 2, 4, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/card.php?mainmenu=accountancy&amp;leftmenu=assets&amp;action=create', 'MenuNewAsset', 1, 'assets', '$user->rights->assets->write', '', 2, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3002__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/type.php?mainmenu=accountancy&amp;leftmenu=assets&amp;action=create', 'MenuTypeAssets', 1, 'assets', '$user->rights->assets->write', '', 2, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->assets->enabled && $leftmenu=="assets"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'accountancy', '', 3000__+MAX_llx_menu__, '/assets/list.php?mainmenu=accountancy&amp;leftmenu=assets', 'MenuListAssets', 1, 'assets', '$user->rights->assets->read', '', 2, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled', __HANDLER__, 'left', 3000__+MAX_llx_menu__, 'accountancy', 'asset', 9__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuAssets', 1, 'assets', '$user->rights->asset->read', '', 0, 20, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/card.php?mainmenu=accountancy&amp;leftmenu=asset&amp;action=create', 'MenuNewAsset', 2, 'assets', '$user->rights->asset->write', '', 0, 21, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuListAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 22, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 23, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;action=create', 'MenuNewTypeAssets', 3, 'assets', '$user->rights->asset->configurer', '', 0, 24, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '$user->rights->asset->read', '', 0, 25, __ENTITY__);
-- Check deposit
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&amp;leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?mainmenu=bank&amp;leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);

8
htdocs/core/menus/standard/eldy.lib.php
View File

@ -349,7 +349,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$tmpentry = array(
'enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->asset->enabled)),
'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->asset->read)),
'comptabilite|accounting',
'comptabilite|accounting|asset',
),
$listofmodulesforexternal
),
@ -1184,7 +1184,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
{
$langs->load("companies");
// Accounting Expert
// Accounting (Double entries)
if (! empty($conf->accounting->enabled))
{
$langs->load("accountancy");
@ -1409,11 +1409,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
{
$langs->load("assets");
$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');
$newmenu->add("/asset/card.php?action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->write);
$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->configurer);
$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
}
}

2
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -43,7 +43,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/barcode/doc/phpbarcode.modules.php
View File

@ -34,7 +34,7 @@ class modPhpbarcode extends ModeleBarCode
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
View File

@ -33,7 +33,7 @@ class modTcpdfbarcode extends ModeleBarCode
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/barcode/mod_barcode_product_standard.php
View File

@ -45,7 +45,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/bom/mod_bom_advanced.php
View File

@ -35,7 +35,7 @@ class mod_bom_advanced extends ModeleNumRefboms
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/bom/mod_bom_standard.php
View File

@ -31,7 +31,7 @@ class mod_bom_standard extends ModeleNumRefboms
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/cheque/mod_chequereceipt_mint.php
View File

@ -31,7 +31,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
View File

@ -32,7 +32,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -75,7 +75,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';
@ -379,7 +379,7 @@ class pdf_einstein extends ModelePDFCommandes
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($notetoshow), 0, 1);
$nexY = $pdf->GetY();

2
htdocs/core/modules/commande/mod_commande_marbre.php
View File

@ -31,7 +31,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/commande/mod_commande_saphir.php
View File

@ -35,7 +35,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -68,7 +68,7 @@ class pdf_strato extends ModelePDFContract
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/contract/mod_contract_magre.php
View File

@ -31,7 +31,7 @@ class mod_contract_magre extends ModelNumRefContracts
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/contract/mod_contract_olive.php
View File

@ -54,7 +54,7 @@ class mod_contract_olive extends ModelNumRefContracts
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/contract/mod_contract_serpis.php
View File

@ -30,7 +30,7 @@ class mod_contract_serpis extends ModelNumRefContracts
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -64,7 +64,7 @@ class pdf_espadon extends ModelePdfExpedition
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -65,7 +65,7 @@ class pdf_merou extends ModelePdfExpedition
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -64,7 +64,7 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expedition/mod_expedition_ribera.php
View File

@ -31,7 +31,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expedition/mod_expedition_safor.php
View File

@ -30,7 +30,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/expensereport/mod_expensereport_jade.php
View File

@ -30,7 +30,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/expensereport/mod_expensereport_sand.php
View File

@ -32,7 +32,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/export/export_csv.modules.php
View File

@ -46,7 +46,7 @@ class ExportCsv extends ModeleExports
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/export/export_excel.modules.php
View File

@ -46,7 +46,7 @@ class ExportExcel extends ModeleExports
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -47,7 +47,7 @@ class ExportExcel2007 extends ExportExcel
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/export/export_excel2007new.modules.php
View File

@ -48,7 +48,7 @@ class ExportExcel2007new extends ModeleExports
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/export/export_tsv.modules.php
View File

@ -45,7 +45,7 @@ class ExportTsv extends ModeleExports
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/facture/mod_facture_mars.php
View File

@ -32,7 +32,7 @@ class mod_facture_mars extends ModeleNumRefFactures
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/facture/mod_facture_mercure.php
View File

@ -35,7 +35,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/fichinter/mod_arctic.php
View File

@ -34,7 +34,7 @@ class mod_arctic extends ModeleNumRefFicheinter
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/fichinter/mod_pacific.php
View File

@ -32,7 +32,7 @@ class mod_pacific extends ModeleNumRefFicheinter
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/holiday/mod_holiday_immaculate.php
View File

@ -32,7 +32,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/holiday/mod_holiday_madonna.php
View File

@ -31,7 +31,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/import/import_csv.modules.php
View File

@ -64,7 +64,7 @@ class ImportCsv extends ModeleImports
/**
* Dolibarr version of driver
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -64,7 +64,7 @@ class ImportXlsx extends ModeleImports
/**
* Dolibarr version of driver
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/import/modules_import.php
View File

@ -56,7 +56,7 @@ class ModeleImports
/**
* Dolibarr version of driver
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/livraison/mod_livraison_jade.php
View File

@ -36,7 +36,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/livraison/mod_livraison_saphir.php
View File

@ -33,7 +33,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

30
htdocs/core/modules/modAsset.class.php
View File

@ -46,8 +46,6 @@ class modAsset extends DolibarrModules
// Id for module (must be unique).
// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
$this->numero = 51000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
// Key text used to identify module (for permissions, menus, etc...)
$this->rights_class = 'asset';
// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
// It is used to group modules by family in module setup page
@ -184,30 +182,42 @@ class modAsset extends DolibarrModules
// Permissions
$this->rights = array(); // Permission array used by this module
$this->rights_class = 'asset';
$r=0;
$r=0;
$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
$r++;
$this->rights[$r][0] = 51001; // Permission id (must not be already used)
$this->rights[$r][1] = 'Read assets'; // Permission label
$this->rights[$r][3] = 1; // Permission by default for new user (0/1)
$this->rights[$r][2] = r;
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$r++;
$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
$this->rights[$r][0] = 51002; // Permission id (must not be already used)
$this->rights[$r][1] = 'Create/Update assets'; // Permission label
$this->rights[$r][3] = 1; // Permission by default for new user (0/1)
$this->rights[$r][2] = w;
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$r++;
$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
$this->rights[$r][0] = 51003; // Permission id (must not be already used)
$this->rights[$r][1] = 'Delete assets'; // Permission label
$this->rights[$r][3] = 1; // Permission by default for new user (0/1)
$this->rights[$r][2] = d;
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$r++;
$this->rights[$r][0] = 51005; // Permission id (must not be already used)
$this->rights[$r][1] = 'Setup types of asset'; // Permission label
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
$this->rights[$r][4] = 'configurer'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
// Main menu entries
// Main menu entries
$this->menu = array(); // List of menus to add
$r=0;

19
htdocs/core/modules/modDebugBar.class.php
View File

@ -1,5 +1,7 @@
<?php
/* This program is free software; you can redistribute it and/or modify
/* Copyright (C) 2019-2020 AXeL-dev <contact.axel.dev@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
@ -103,19 +105,4 @@ class modDebugBar extends DolibarrModules
return $this->_init($sql, $options);
}
/**
* Function called after module configuration.
*
* @return void
*/
public function loadSettings()
{
$this->addPermission("use", "UseDebugBar", "u");
$this->enableHooks(array(
'main',
'login'
));
}
}

2
htdocs/core/modules/payment/mod_payment_ant.php
View File

@ -32,7 +32,7 @@ class mod_payment_ant extends ModeleNumRefPayments
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/payment/mod_payment_cicada.php
View File

@ -31,7 +31,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/product/mod_codeproduct_elephant.php
View File

@ -56,7 +56,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/product/mod_codeproduct_leopard.php
View File

@ -61,7 +61,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/project/mod_project_simple.php
View File

@ -33,7 +33,7 @@ class mod_project_simple extends ModeleNumRefProjects
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/project/mod_project_universal.php
View File

@ -32,7 +32,7 @@ class mod_project_universal extends ModeleNumRefProjects
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -69,7 +69,7 @@ class doc_generic_task_odt extends ModelePDFTask
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr';

2
htdocs/core/modules/project/task/mod_task_simple.php
View File

@ -33,7 +33,7 @@ class mod_task_simple extends ModeleNumRefTask
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/project/task/mod_task_universal.php
View File

@ -32,7 +32,7 @@ class mod_task_universal extends ModeleNumRefTask
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

10
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -74,7 +74,7 @@ class pdf_cyan extends ModelePDFPropales
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'development';
@ -434,7 +434,7 @@ class pdf_cyan extends ModelePDFPropales
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
$pdf->startTransaction();
$pdf->SetFont('', '', $default_font_size - 1);
@ -549,11 +549,11 @@ class pdf_cyan extends ModelePDFPropales
$pdf->startTransaction();
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
$pdf->rollbackTransaction(true);
$iniY = $tab_top + $this->tabTitleHeight + 2;
$curY = $tab_top + $this->tabTitleHeight + 2;
$nexY = $tab_top + $this->tabTitleHeight + 2;
// Loop on each lines
$pageposbeforeprintlines=$pdf->getPage();
$pagenb = $pageposbeforeprintlines;
@ -1460,7 +1460,7 @@ class pdf_cyan extends ModelePDFPropales
$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
if (empty($hidetop)){
$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight); // line prend une position y en 2eme param et 4eme param
}

2
htdocs/core/modules/propale/mod_propale_marbre.php
View File

@ -33,7 +33,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/propale/mod_propale_saphir.php
View File

@ -35,7 +35,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/societe/mod_codeclient_elephant.php
View File

@ -56,7 +56,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/societe/mod_codeclient_leopard.php
View File

@ -60,7 +60,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/societe/mod_codeclient_monkey.php
View File

@ -54,7 +54,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/societe/mod_codecompta_aquarium.php
View File

@ -45,7 +45,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/societe/mod_codecompta_panicum.php
View File

@ -44,7 +44,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
View File

@ -35,7 +35,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
View File

@ -38,7 +38,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
View File

@ -33,7 +33,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
View File

@ -34,7 +34,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
View File

@ -32,7 +32,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
View File

@ -31,7 +31,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
View File

@ -33,7 +33,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
View File

@ -35,7 +35,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/ticket/mod_ticket_simple.php
View File

@ -32,7 +32,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

2
htdocs/core/modules/ticket/mod_ticket_universal.php
View File

@ -31,7 +31,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
{
/**
* Dolibarr version of the loaded document
* @public string
* @var string
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'

8
htdocs/langs/en_US/assets.lang
View File

@ -55,5 +55,11 @@ MenuAssets = Assets
MenuNewAsset = New asset
MenuTypeAssets = Type assets
MenuListAssets = List
MenuNewTypeAssets = New type
MenuNewTypeAssets = New
MenuListTypeAssets = List
#
# Module
#
NewAssetType=New asset type
NewAsset=New asset