mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-06 17:13:03 +01:00
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Qual: Introduce getDataToShowPhoto to prepare generic code
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix missing trans
* Fix langs
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Remove useless files in web templates
* Clean code
* Fix duplicate translation key
* Fix duplicate translation key
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix duplicate key
* Fix $object
* Debug v19
* WIP SMSing
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* WIP EMAILINGS_SUPPORT_ALSO_SMS
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* WIP SMSing
* Debug the "validate" feature
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Clean code
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Enhance rector to fix empty($user->rights->modulex->perm1)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Fix template to use v19 dev rules
* Fix use v19 dev rules
* Fix phpunit
* Debug v19
* Clean code
* Use rector to convert user->rights into user->hasRight
* Clean code
* Use rector to convert user->rights into user->hasRight
* Use rector to convert user->rights into user->hasRight
* Clean code
* Fix phpcs
* add editorconfig for sql files (#27999)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
* add model_pdf field in llx_ticket-ticket.sql (#27996)
* add model_pdf field in llx_ticket-ticket.sql
* Update 19.0.0-20.0.0.sql
* Update 19.0.0-20.0.0.sql
* Improve wording in README (#27994)
* fix phpstan (#27989)
* fix phpstan
* Update UserRightsToFunction.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
* Qual: Fix spelling/working in datapolicy translations (#28006)
# Qual: Fix spelling/wording in datapolicy translations
Fixed some spelling and wording in datapolicy translations.
* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)
htdocs/ticket/class/ticketstats.class.php 98 Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()
* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix user with readonly perm on email template must be able to read.
* Fix doc
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Better message
* Add missing fields in merge of thirdparty
* Debug v19 selection of ticket printer per terminal
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Use constant
* NEW: Adding a recipient on emails sent, change status to sent partialy.
* fix travis (#28052)
* fix travis
* Update partnership.class.php
* fix php doc (#28047)
* fix undefined array key (#28048)
* Add region and departament for Cuba (#28046)
* Update llx_10_c_regions.sql
Add Cuba Regions (id_country=77)
* Update llx_20_c_departements.sql
Add Provinces Cuba (id country=77)
* Find the typo (#28050)
* Find the typo
* clean code
* add last_main_doc field to product (#28045)
* add las_main_doc field to product
* add field fetch
* NEW Add Categorie filter for ActionComm (#28041)
* New Add Categorie filter for ActionComm
New Add Categorie filter for ActionComm
* Fix space errors
Fix space errors
* Fix space errors 2
Fix space errors 2
* Update cunits.class.php (#28056)
FIX: error SQL when creating a Cunit
* Update codespell-lines-ignore.txt to avoid PR merge conflict
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
47 lines
1.3 KiB
PHP
47 lines
1.3 KiB
PHP
<?php
|
|
|
|
// Add line to upload new file
|
|
print '<!-- expensereport_addfile.tpl.php -->'."\n";
|
|
print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
|
|
|
|
// Num line
|
|
if ($action == 'editline') {
|
|
print '<td></td>';
|
|
}
|
|
|
|
// Upload section
|
|
print '<td colspan="'.($action == 'editline' ? $colspan - 1 : $colspan).'">';
|
|
|
|
$modulepart = 'expensereport';
|
|
$permission = $user->hasRight('expensereport', 'creer');
|
|
|
|
// We define var to enable the feature to add prefix of uploaded files
|
|
$savingdocmask = '';
|
|
if (!getDolGlobalString('MAIN_DISABLE_SUGGEST_REF_AS_PREFIX')) {
|
|
//var_dump($modulepart);
|
|
if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch'))) {
|
|
$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
|
|
}
|
|
}
|
|
|
|
// Show upload form (document and links)
|
|
$formfile->form_attach_new_file(
|
|
$_SERVER["PHP_SELF"].'?id='.$object->id,
|
|
'none',
|
|
0,
|
|
0,
|
|
$permission,
|
|
$conf->browser->layout == 'phone' ? 40 : 60,
|
|
$object,
|
|
'',
|
|
1,
|
|
$savingdocmask,
|
|
0,
|
|
'formuserfile',
|
|
'accept',
|
|
'',
|
|
1
|
|
);
|
|
|
|
print '</td></tr>';
|