From 969aea98e1ed0a62f8228883b3ca63c1bed301ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Jul 2018 22:31:28 +0200 Subject: [PATCH] Fix label of copy must not be same --- htdocs/compta/sociales/card.php | 9 +++++---- htdocs/langs/en_US/compta.lang | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 85e555de468..db3a99759d1 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -241,11 +241,12 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char { $object->paye = 0; $object->id = $object->ref = null; + $object->lib = $langs->trans("CopyOf").' '.$object->lib; - if(GETPOST('clone_for_next_month') != '') { - - $object->date_ech = strtotime('+1month', $object->date_ech); - $object->periode = strtotime('+1month', $object->periode); + if (GETPOST('clone_for_next_month') != '') + { + $object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm'); + $object->periode = dol_time_plus_duree($object->periode, 1, 'm'); } if ($object->check()) diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 4b422aa2629..ba36f59ba4a 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -233,7 +233,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined. CloneTax=Clone a social/fiscal tax -ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment +ConfirmCloneTax=Confirm the clone of a social/fiscal tax CloneTaxForNextMonth=Clone it for next month SimpleReport=Simple report AddExtraReport=Extra reports (add foreign and national customer report)