FIx #12466 manually (conflict pb)
This commit is contained in:
parent
5d7a1f1265
commit
07c01a821e
@ -986,7 +986,7 @@ if (empty($reshook))
|
|||||||
$object->entity = $originentity;
|
$object->entity = $originentity;
|
||||||
}
|
}
|
||||||
$object->socid = GETPOST('socid', 'int');
|
$object->socid = GETPOST('socid', 'int');
|
||||||
$object->number = $_POST['ref'];
|
$object->ref = $_POST['ref'];
|
||||||
$object->date = $dateinvoice;
|
$object->date = $dateinvoice;
|
||||||
$object->date_pointoftax = $date_pointoftax;
|
$object->date_pointoftax = $date_pointoftax;
|
||||||
$object->note_public = trim(GETPOST('note_public', 'none'));
|
$object->note_public = trim(GETPOST('note_public', 'none'));
|
||||||
@ -1166,7 +1166,7 @@ if (empty($reshook))
|
|||||||
{
|
{
|
||||||
$object->socid = GETPOST('socid', 'int');
|
$object->socid = GETPOST('socid', 'int');
|
||||||
$object->type = $_POST['type'];
|
$object->type = $_POST['type'];
|
||||||
$object->number = $_POST['ref'];
|
$object->ref = $_POST['ref'];
|
||||||
$object->date = $dateinvoice;
|
$object->date = $dateinvoice;
|
||||||
$object->date_pointoftax = $date_pointoftax;
|
$object->date_pointoftax = $date_pointoftax;
|
||||||
$object->note_public = trim(GETPOST('note_public', 'none'));
|
$object->note_public = trim(GETPOST('note_public', 'none'));
|
||||||
@ -1216,7 +1216,7 @@ if (empty($reshook))
|
|||||||
// Si facture standard
|
// Si facture standard
|
||||||
$object->socid = GETPOST('socid', 'int');
|
$object->socid = GETPOST('socid', 'int');
|
||||||
$object->type = GETPOST('type');
|
$object->type = GETPOST('type');
|
||||||
$object->number = $_POST['ref'];
|
$object->ref = $_POST['ref'];
|
||||||
$object->date = $dateinvoice;
|
$object->date = $dateinvoice;
|
||||||
$object->date_pointoftax = $date_pointoftax;
|
$object->date_pointoftax = $date_pointoftax;
|
||||||
$object->note_public = trim(GETPOST('note_public', 'none'));
|
$object->note_public = trim(GETPOST('note_public', 'none'));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user