Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
875a8dc2ef
5 changed files with 25 additions and 14 deletions
|
|
@ -1530,11 +1530,12 @@ if (empty($reshook)) {
|
|||
$element = $subelement = 'expedition';
|
||||
}
|
||||
|
||||
$object->origin = $origin;
|
||||
$object->origin = $origin; // deprecated
|
||||
$object->origin_type = $origin;
|
||||
$object->origin_id = $originid;
|
||||
|
||||
// Possibility to add external linked objects with hooks
|
||||
$object->linked_objects[$object->origin] = $object->origin_id;
|
||||
$object->linked_objects[$object->origin_type] = $object->origin_id;
|
||||
// link with order if it is a shipping invoice
|
||||
if ($object->origin == 'shipping') {
|
||||
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
|
||||
|
|
@ -1903,7 +1904,7 @@ if (empty($reshook)) {
|
|||
}*/
|
||||
|
||||
// Hooks
|
||||
$parameters = array('objFrom' => $srcobject);
|
||||
$parameters = array('origin_type' => $object->origin_type, 'origin_id' => $object->origin_id, 'objFrom' => $srcobject);
|
||||
$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
|
||||
// modified by hook
|
||||
if ($reshook < 0) {
|
||||
|
|
@ -1959,7 +1960,8 @@ if (empty($reshook)) {
|
|||
if (!empty($origin) && !empty($originid)) {
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
|
||||
|
||||
$object->origin = $origin;
|
||||
$object->origin = $origin; // deprecated
|
||||
$object->origin_type = $origin;
|
||||
$object->origin_id = $originid;
|
||||
|
||||
// retained warranty
|
||||
|
|
@ -1981,8 +1983,6 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
foreach ($object->lines as $i => &$line) {
|
||||
$line->origin = $object->origin;
|
||||
$line->origin_id = $line->id;
|
||||
$line->fk_prev_id = $line->id;
|
||||
$line->fetch_optionals();
|
||||
if (getDolGlobalInt('INVOICE_USE_SITUATION') == 2) {
|
||||
|
|
@ -2023,6 +2023,7 @@ if (empty($reshook)) {
|
|||
$object->note = trim(GETPOST('note', 'restricthtml'));
|
||||
$object->note_private = trim(GETPOST('note', 'restricthtml'));
|
||||
$object->ref_client = GETPOST('ref_client', 'alpha');
|
||||
$object->ref_customer = GETPOST('ref_client', 'alpha');
|
||||
$object->model_pdf = GETPOST('model', 'alpha');
|
||||
$object->fk_project = GETPOSTINT('projectid');
|
||||
$object->cond_reglement_id = GETPOSTINT('cond_reglement_id');
|
||||
|
|
@ -2035,6 +2036,7 @@ if (empty($reshook)) {
|
|||
// Special properties of replacement invoice
|
||||
|
||||
$object->situation_counter += 1;
|
||||
|
||||
$id = $object->createFromCurrent($user);
|
||||
if ($id <= 0) {
|
||||
$mesg = $object->error;
|
||||
|
|
@ -2048,6 +2050,15 @@ if (empty($reshook)) {
|
|||
if ($ret > 0) {
|
||||
$nextSituationInvoice->insertExtraFields();
|
||||
}
|
||||
|
||||
// Hooks
|
||||
$parameters = array('origin_type' => $object->origin_type, 'origin_id' => $object->origin_id);
|
||||
$reshook = $hookmanager->executeHooks('createFrom', $parameters, $nextSituationInvoice, $action); // Note that $action and $object may have been
|
||||
// modified by hook
|
||||
if ($reshook < 0) {
|
||||
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ if (empty($reshook)) {
|
|||
|
||||
print "\n";
|
||||
print "<!-- Begin Bookmarks list -->\n";
|
||||
print '<div class="center"><div class="center" style="padding: 6px;">';
|
||||
print '<div class="center"><div class="center" style="padding: 30px;">';
|
||||
print '<style>.menu_titre { padding-top: 7px; }</style>';
|
||||
print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
|
||||
print $bookmarkList;
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ if ($conf->dol_use_jmobile) {
|
|||
// Show all forms
|
||||
print "\n";
|
||||
print "<!-- Begin SearchForm -->\n";
|
||||
print '<div class="center"><div class="center" style="padding: 6px;">';
|
||||
print '<div class="center"><div class="center" style="padding: 30px;">';
|
||||
print '<style>.menu_titre { padding-top: 7px; }</style>';
|
||||
print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
|
||||
print $searchform;
|
||||
|
|
|
|||
|
|
@ -578,13 +578,13 @@ dropdown-holder {
|
|||
}
|
||||
|
||||
.tmenu .dropdown-menu, .login_block .dropdown-menu, .topnav .dropdown-menu {
|
||||
margin-left: 5px;
|
||||
margin-left: 8px;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
#topmenu-quickadd-dropdown .dropdown-menu {
|
||||
min-width: 220px;
|
||||
max-width: 235px;
|
||||
max-width: 270px;
|
||||
}
|
||||
#topmenu-bookmark-dropdown .dropdown-menu {
|
||||
min-width: 220px;
|
||||
|
|
|
|||
|
|
@ -8302,15 +8302,15 @@ table.jPicker {
|
|||
height: 50px;
|
||||
|
||||
z-index: 202;
|
||||
min-width: 200px; /* must be width of menu + padding + padding of sidenav */
|
||||
max-width: 200px; /* must be width of menu + padding + padding of sidenav */
|
||||
width: 200px; /* must be width of menu + padding + padding of sidenav */
|
||||
min-width: 245px; /* must be width of menu + padding + padding of sidenav */
|
||||
max-width: 245px; /* must be width of menu + padding + padding of sidenav */
|
||||
width: 245px; /* must be width of menu + padding + padding of sidenav */
|
||||
}
|
||||
.loginbuttonexternal {
|
||||
width: 260px;
|
||||
}
|
||||
.side-nav-vert .user-menu .dropdown-menu {
|
||||
width: 234px !important;
|
||||
width: 278px !important; /* must be width of menu + padding + padding of sidenav */
|
||||
}
|
||||
div.login_block_other {
|
||||
margin-right: unset;
|
||||
|
|
|
|||
Loading…
Reference in a new issue