mirror of
https://github.com/devcode-it/openstamanager.git
synced 2025-02-17 03:51:06 +01:00
Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
3948524de7
@ -531,7 +531,11 @@ switch (filter('op')) {
|
|||||||
// Duplica ddt
|
// Duplica ddt
|
||||||
case 'copy':
|
case 'copy':
|
||||||
$new = $ddt->replicate();
|
$new = $ddt->replicate();
|
||||||
|
<<<<<<< HEAD
|
||||||
$new->numero = DDT::getNextNumero($new->data, $dir, $id_segment);
|
$new->numero = DDT::getNextNumero($new->data, $dir, $id_segment);
|
||||||
|
=======
|
||||||
|
$new->numero = DDT::getNextNumero($new->data, $dir, $new->$id_segment);
|
||||||
|
>>>>>>> a0f50892584c9e0015c918d347321c704501722f
|
||||||
$new->numero_esterno = DDT::getNextNumeroSecondario($new->data, $dir, $new->id_segment);
|
$new->numero_esterno = DDT::getNextNumeroSecondario($new->data, $dir, $new->id_segment);
|
||||||
|
|
||||||
$stato = Stato::where('descrizione', '=', 'Bozza')->first();
|
$stato = Stato::where('descrizione', '=', 'Bozza')->first();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user