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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-25 20:12:34 +02:00
commit 1b5f7b78b5
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/accountancy/bookkeeping/balance.php
View File

@ -159,11 +159,11 @@ if ($action == 'export_csv')
foreach ($object->lines as $line) foreach ($object->lines as $line)
{ {
print length_accountg($line->numero_compte).$sep; print '"'.length_accountg($line->numero_compte).'"'.$sep;
print $object->get_compte_desc($line->numero_compte).$sep; print '"'.$object->get_compte_desc($line->numero_compte).'"'.$sep;
print price($line->debit).$sep; print '"'.price($line->debit).'"'.$sep;
print price($line->credit).$sep; print '"'.price($line->credit).'"'.$sep;
print price($line->debit - $line->credit).$sep; print '"'.price($line->debit - $line->credit).'"'.$sep;
print "\n"; print "\n";
} }

2
htdocs/admin/translation.php
View File

@ -187,7 +187,7 @@ if ($action == 'delete')
$form = new Form($db); $form = new Form($db);
$formadmin = new FormAdmin($db); $formadmin = new FormAdmin($db);
$wikihelp = 'EN:Setup Translation|FR:Paramétrage traduction|ES:Configuración'; $wikihelp = 'EN:Setup_Translation|FR:Paramétrage_Traduction|ES:Configuración_Traducción';
llxHeader('', $langs->trans("Setup"), $wikihelp); llxHeader('', $langs->trans("Setup"), $wikihelp);
$param = '&mode='.urlencode($mode); $param = '&mode='.urlencode($mode);

6
htdocs/comm/mailing/cibles.php
View File

@ -66,6 +66,8 @@ $modulesdir = dolGetModulesDirs('/mailings');
$object = new Mailing($db); $object = new Mailing($db);
$result = $object->fetch($id); $result = $object->fetch($id);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('ciblescard', 'globalcard'));
/* /*
* Actions * Actions
@ -453,6 +455,10 @@ if ($object->fetch($id) >= 0)
} }
} // End foreach dir } // End foreach dir
$parameters = array();
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '</div>'; print '</div>';
print '<br><br>'; print '<br><br>';

2
htdocs/contrat/list.php
View File

@ -244,6 +244,8 @@ if ($search_email) $sql .= natural_search('s.email', $search_email);
if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract); if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer); if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier); if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
if ($search_zip) $sql .= natural_search(array('s.zip'), $search_zip);
if ($search_town) $sql .= natural_search(array('s.town'), $search_town);
if ($search_sale > 0) if ($search_sale > 0)
{ {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale; $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;

2
htdocs/fourn/commande/card.php
View File

@ -1260,6 +1260,8 @@ if (empty($reshook))
$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id); $tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
} }
$object->special_code = $lines[$i]->special_code;
$result = $object->addline( $result = $object->addline(
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,