From 12e2a3c7c98e8134b3701bde1c4b3bc2730a018c Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 20 Nov 2013 13:30:39 +0100 Subject: [PATCH 1/2] Merge --- htdocs/langs/lv_LV/link.lang | 36 ++++++++++++++++---------------- htdocs/langs/lv_LV/printipp.lang | 36 ++++++++++++++++---------------- htdocs/langs/sk_SK/link.lang | 36 ++++++++++++++++---------------- htdocs/langs/sk_SK/printipp.lang | 36 ++++++++++++++++---------------- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/htdocs/langs/lv_LV/link.lang b/htdocs/langs/lv_LV/link.lang index b868996db5d..65f81c8548d 100644 --- a/htdocs/langs/lv_LV/link.lang +++ b/htdocs/langs/lv_LV/link.lang @@ -1,18 +1,18 @@ -/* - * Language code: lv_LV - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:35:59 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). -// Reference language: en_US -> lv_LV -LinkANewFile=Saite jaunu failu / dokumentu -LinkedFiles=Saistīts failus un dokumentus -NoLinkFound=Nav reģistrētu saites -LinkComplete=Fails ir saistīts veiksmīgi -ErrorFileNotLinked=Failu nevar saistīt -LinkRemoved=Saite %s ir noņemta -ErrorFailedToDeleteLink=Neizdevās noņemt saiti "%s" -ErrorFailedToUpdateLink=Neizdevās atjaunināt saikne "%s" -// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:40:57). +/* + * Language code: lv_LV + * Automatic generated via autotranslator.php tool + * Generation date 2013-11-08 23:35:59 + */ + + +// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). +// Reference language: en_US -> lv_LV +LinkANewFile=Saite jaunu failu / dokumentu +LinkedFiles=Saistīts failus un dokumentus +NoLinkFound=Nav reģistrētu saites +LinkComplete=Fails ir saistīts veiksmīgi +ErrorFileNotLinked=Failu nevar saistīt +LinkRemoved=Saite %s ir noņemta +ErrorFailedToDeleteLink=Neizdevās noņemt saiti "%s" +ErrorFailedToUpdateLink=Neizdevās atjaunināt saikne "%s" +// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:40:57). diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang index bba261c4d07..4a1fa4d4ed3 100644 --- a/htdocs/langs/lv_LV/printipp.lang +++ b/htdocs/langs/lv_LV/printipp.lang @@ -1,18 +1,18 @@ -/* - * Language code: lv_LV - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-09 12:40:15 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). -// Reference language: en_US -> lv_LV -PrintIPPSetup=Setup moduļa Direct Print -PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi. -PRINTIPP_ENABLED=Rādīt Picto "Direct print" par dokumentu saraksts -PRINTIPP_HOST=Drukas serveris -PRINTIPP_PORT=Osta -PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Parole -NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup) -// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40). +/* + * Language code: lv_LV + * Automatic generated via autotranslator.php tool + * Generation date 2013-11-09 12:40:15 + */ + + +// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). +// Reference language: en_US -> lv_LV +PrintIPPSetup=Setup moduļa Direct Print +PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi. +PRINTIPP_ENABLED=Rādīt Picto "Direct print" par dokumentu saraksts +PRINTIPP_HOST=Drukas serveris +PRINTIPP_PORT=Osta +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Parole +NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup) +// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40). diff --git a/htdocs/langs/sk_SK/link.lang b/htdocs/langs/sk_SK/link.lang index 910d15af974..abfa69d7e2a 100644 --- a/htdocs/langs/sk_SK/link.lang +++ b/htdocs/langs/sk_SK/link.lang @@ -1,18 +1,18 @@ -/* - * Language code: sk_SK - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:25:26 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). -// Reference language: en_US -> sk_SK -LinkANewFile=Prepojenie nový súbor / dokument -LinkedFiles=Prepojené súbory a dokumenty -NoLinkFound=Žiadny registrovaný odkazy -LinkComplete=Súbor bol úspešne pripojil -ErrorFileNotLinked=Súbor nemohol byť spojená -LinkRemoved=Odkaz %s bol odstránený -ErrorFailedToDeleteLink=Nepodarilo sa odstrániť odkaz "%s" -ErrorFailedToUpdateLink=Nepodarilo sa aktualizovať odkaz "%s" -// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:35:10). +/* + * Language code: sk_SK + * Automatic generated via autotranslator.php tool + * Generation date 2013-11-08 23:25:26 + */ + + +// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). +// Reference language: en_US -> sk_SK +LinkANewFile=Prepojenie nový súbor / dokument +LinkedFiles=Prepojené súbory a dokumenty +NoLinkFound=Žiadny registrovaný odkazy +LinkComplete=Súbor bol úspešne pripojil +ErrorFileNotLinked=Súbor nemohol byť spojená +LinkRemoved=Odkaz %s bol odstránený +ErrorFailedToDeleteLink=Nepodarilo sa odstrániť odkaz "%s" +ErrorFailedToUpdateLink=Nepodarilo sa aktualizovať odkaz "%s" +// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:35:10). diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang index 824e51a686b..1b051dae6cb 100644 --- a/htdocs/langs/sk_SK/printipp.lang +++ b/htdocs/langs/sk_SK/printipp.lang @@ -1,18 +1,18 @@ -/* - * Language code: sk_SK - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:25:26 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). -// Reference language: en_US -> sk_SK -PrintIPPSetup=Nastavenie modulu Priama tlač -PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem priame des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháre. -PRINTIPP_ENABLED=Zobraziť Piktogram "Priama tlač" do zoznamu dokumentov -PRINTIPP_HOST=Tlačový server -PRINTIPP_PORT=Prístav -PRINTIPP_USER=Prihlásenie -PRINTIPP_PASSWORD=Heslo -NoPrinterFound=Žiadne tlačiarne nájdené (skontrolujte poháre Nasta) -// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:48:51). +/* + * Language code: sk_SK + * Automatic generated via autotranslator.php tool + * Generation date 2013-11-08 23:25:26 + */ + + +// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). +// Reference language: en_US -> sk_SK +PrintIPPSetup=Nastavenie modulu Priama tlač +PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem priame des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháre. +PRINTIPP_ENABLED=Zobraziť Piktogram "Priama tlač" do zoznamu dokumentov +PRINTIPP_HOST=Tlačový server +PRINTIPP_PORT=Prístav +PRINTIPP_USER=Prihlásenie +PRINTIPP_PASSWORD=Heslo +NoPrinterFound=Žiadne tlačiarne nájdené (skontrolujte poháre Nasta) +// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:48:51). From 7e8a7f7e7f65a6d4b58f214aee0768404a16e020 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 17 Jan 2014 15:44:06 +0100 Subject: [PATCH 2/2] Allow to clone an invoice on a different third --- htdocs/compta/facture.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d059e47d555..14ad67badca 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2805,6 +2805,7 @@ else if ($id > 0 || ! empty($ref)) $formquestion=array( //'text' => $langs->trans("ConfirmClone"), //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1) + array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company('','socid','(s.client=1 OR s.client=2 OR s.client=3)',1)) ); // Paiement incomplet. On demande si motif = escompte ou autre $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes',1);