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

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

Browse Source 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
This commit is contained in:
Laurent Destailleur 2020-10-22 17:38:48 +02:00
commit a17c391efe
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/commonobject.class.php
View File

@ -7261,6 +7261,9 @@ abstract class CommonObject
var parent = $(this).find("option[parent]:first").attr("parent"); var parent = $(this).find("option[parent]:first").attr("parent");
var infos = parent.split(":"); var infos = parent.split(":");
var parent_list = infos[0]; var parent_list = infos[0];
showOptions(child_list, parent_list);
/* Activate the handler to call showOptions on each future change */
$("select[name=\""+parent_list+"\"]").change(function() { $("select[name=\""+parent_list+"\"]").change(function() {
showOptions(child_list, parent_list); showOptions(child_list, parent_list);
}); });

6
htdocs/core/lib/functions2.lib.php
View File

@ -1911,6 +1911,12 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
$classpath = 'fourn/class'; $classpath = 'fourn/class';
$module = 'fournisseur'; $module = 'fournisseur';
} }
elseif ($objecttype == 'supplier_proposal') {
$classfile = 'supplier_proposal';
$classname = 'SupplierProposal';
$classpath = 'supplier_proposal/class';
$module = 'supplier_proposal';
}
elseif ($objecttype == 'stock') { elseif ($objecttype == 'stock') {
$classpath = 'product/stock/class'; $classpath = 'product/stock/class';
$classfile = 'entrepot'; $classfile = 'entrepot';

3
htdocs/core/tpl/extrafields_view.tpl.php
View File

@ -226,6 +226,9 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
var parent = $(this).find("option[parent]:first").attr("parent"); var parent = $(this).find("option[parent]:first").attr("parent");
var infos = parent.split(":"); var infos = parent.split(":");
var parent_list = infos[0]; var parent_list = infos[0];
showOptions(child_list, parent_list);
/* Activate the handler to call showOptions on each future change */
$("select[name=\""+parent_list+"\"]").change(function() { $("select[name=\""+parent_list+"\"]").change(function() {
showOptions(child_list, parent_list); showOptions(child_list, parent_list);
}); });

1
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -299,6 +299,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
//Build array of quantity ordered by product //Build array of quantity ordered by product
if (is_array($order->lines) && count($order->lines) > 0) { if (is_array($order->lines) && count($order->lines) > 0) {
foreach ($order->lines as $orderline) { foreach ($order->lines as $orderline) {
if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
$qtyordred[$orderline->fk_product] += $orderline->qty; $qtyordred[$orderline->fk_product] += $orderline->qty;
} }
} }

5
htdocs/product/composition/card.php
View File

@ -366,11 +366,12 @@ if ($id > 0 || !empty($ref))
$fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent) ? $product_fourn->fourn_remise_percent : 0); $fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent) ? $product_fourn->fourn_remise_percent : 0);
$fourn_remise = (!empty($product_fourn->fourn_remise) ? $product_fourn->fourn_remise : 0); $fourn_remise = (!empty($product_fourn->fourn_remise) ? $product_fourn->fourn_remise : 0);
$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent / 100) - $fourn_remise), 'MT'); $unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU');
$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
$total += $totalline; $total += $totalline;
print '<td class="right">'; print '<td class="right">';
print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : '').price($fourn_unitprice, '', '', 0, 0, -1, $conf->currency)); print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : '').price($unitline, '', '', 0, 0, -1, $conf->currency));
print '</td>'; print '</td>';
// Best selling price // Best selling price