fix: When create invoice from shipping list translation of mass actio…

…n is wrong and invoice line desc is wrong

htdocs/expedition/list.php

@@ -268,7 +268,7 @@
 				$objecttmp->fk_project = $expd->fk_project;
 				$objecttmp->multicurrency_code = !empty($expdCmdSrc->multicurrency_code) ? $expdCmdSrc->multicurrency_code : (!empty($objecttmp->thirdparty->multicurrency_code) ? $objecttmp->thirdparty->multicurrency_code : $expd->multicurrency_code);
 				if (empty($createbills_onebythird)) {
-					$objecttmp->ref_client = $expd->ref_client;
+					$objecttmp->ref_customer = $expd->ref_customer;
 				}
 
 				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -277,7 +277,7 @@
 				}
 
 				$objecttmp->date = $datefacture;
-				$objecttmp->origin    = 'shipping';
+				$objecttmp->origin_type    = 'shipping';
 				$objecttmp->origin_id = $id_sending;
 
 				$objecttmp->array_options = $expd->array_options; // Copy extrafields
@@ -341,16 +341,16 @@
 					$num = count($lines);
 
 					for ($i = 0; $i < $num; $i++) {
-						$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
+						$desc = ($lines[$i]->product_desc ? $lines[$i]->product_desc : '');
 						// If we build one invoice for several sendings, we must put the ref of sending on the invoice line
 						if (!empty($createbills_onebythird)) {
-							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$expd->ref.' - '.dol_print_date($expd->date, 'day'));
+							$desc = dol_concatdesc($desc, $langs->trans("Order").': '.$expdCmdSrc->ref. ' - '. $langs->trans("Shipment").': '.$expd->ref.($expd->date_shipping ? ' - '.dol_print_date($expd->date_shipping, 'day'):''));
 						}
 
 						if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
 							// Negative line, we create a discount line
 							$discount = new DiscountAbsolute($db);
-							$discount->fk_soc = $objecttmp->socid;
+							$discount->socid = $objecttmp->socid;
 							$discount->amount_ht = abs($lines[$i]->total_ht);
 							$discount->amount_tva = abs($lines[$i]->total_tva);
 							$discount->amount_ttc = abs($lines[$i]->total_ttc);
@@ -988,7 +988,7 @@
 	'presend'  => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($user->hasRight('facture', 'creer')) {
-	$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomerFromSendings");
+	$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomerFromShippings");
 }
 if (in_array($massaction, array('presend', 'createbills'))) {
 	$arrayofmassactions = array();
@@ -1070,7 +1070,7 @@
 
 	print '<br>';
 	print '<div class="center">';
-	print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomerFromSendings').'">  ';
+	print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomerFromShippings').'">  ';
 	print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 	print '<br>';

htdocs/langs/ca_ES/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=No s'ha trobat cap producte per a enviar al magatz
 WeightVolShort=Pes/Vol.
 ValidateOrderFirstBeforeShipment=S'ha de validar la comanda abans de fer expedicions.
 NoLineGoOnTabToAddSome=Sense línia, aneu a la pestanya "%s" per afegir
-CreateInvoiceForThisCustomerFromSendings=Enviaments de factures
+CreateInvoiceForThisCustomerFromShippings=Enviaments de factures
 IfValidateInvoiceIsNoSendingStayUnbilled=Si la validació de la factura és "No", l'enviament es mantindrà en l'estat "No facturat" fins que la factura es validi.
 OptionToSetSendingBilledNotEnabled=L'opció del mòdul Flux de treball, per establir l'enviament a 'Facturat' automàticament quan la factura es valida, no està habilitada, de manera que hauràs de configurar l'estat dels enviaments a 'Facturat' manualment després de generar la factura.
 

htdocs/langs/el_GR/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Δεν βρέθηκε προϊόν προς απο
 WeightVolShort=Βάρος/Όγκος
 ValidateOrderFirstBeforeShipment=Θα πρέπει πρώτα να επικυρώσετε την παραγγελία πριν να μπορέσετε να πραγματοποιήσετε αποστολές.
 NoLineGoOnTabToAddSome=Χωρίς γραμμή, μεταβείτε στην καρτέλα "%s" για προσθήκη
-CreateInvoiceForThisCustomerFromSendings=Τιμολόγηση αποστολών
+CreateInvoiceForThisCustomerFromShippings=Τιμολόγηση αποστολών
 IfValidateInvoiceIsNoSendingStayUnbilled=Εάν η επικύρωση τιμολογίου είναι «Όχι», η αποστολή θα παραμείνει στην κατάσταση «Μη τιμολογημένη» μέχρι να επικυρωθεί το τιμολόγιο.
 OptionToSetSendingBilledNotEnabled=Η επιλογή από την ενότητα Ροή εργασιών, για να ορίσετε την αποστολή σε "Τιμολογημένη" αυτόματα όταν επικυρώνεται το τιμολόγιο, δεν είναι ενεργοποιημένη, επομένως θα πρέπει να ορίσετε την κατάσταση των αποστολών σε "Τιμολογημένες" με μη αυτόματο τρόπο μετά τη δημιουργία του τιμολόγιου.
 

htdocs/langs/en_US/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. C
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
-CreateInvoiceForThisCustomerFromSendings=Bill sendings
+CreateInvoiceForThisCustomerFromShippings=Create Bills
 IfValidateInvoiceIsNoSendingStayUnbilled=If invoice validation is 'No', the sending will remain to status 'Unbilled' until the invoice is validated.
 OptionToSetSendingBilledNotEnabled=Option from module Workflow, to set sending to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of sendings to 'Billed' manually after the invoice has been generated.
 

htdocs/langs/fr_FR/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouvé dans
 WeightVolShort=Poids/vol.
 ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une expédition.
 NoLineGoOnTabToAddSome=Aucune ligne, allez sur l'onglet "%s" pour en ajouter
-CreateInvoiceForThisCustomerFromSendings=Envois de factures
+CreateInvoiceForThisCustomerFromShippings=Création de factures
 IfValidateInvoiceIsNoSendingStayUnbilled=Si la validation de la facture est "Non", l'envoi restera à l'état "Non facturé" jusqu'à ce que la facture soit validée.
 OptionToSetSendingBilledNotEnabled=L'option du module Workflow, qui permet de définir l'envoi comme "facturé" automatiquement lorsque la facture est validée, n'est pas activée. Vous devrez donc définir manuellement l'état des envois comme "facturé" après que la facture a été générée.
 

htdocs/langs/hu_HU/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Nem található szállítandó termék a(z) <b>%s<
 WeightVolShort=Súly/térfogat.
 ValidateOrderFirstBeforeShipment=Elõször érvényesítenie kell a rendelést, mielõtt kiszállítást végezhet.
 NoLineGoOnTabToAddSome=Nincs sor, lépjen a „%s” lapra a hozzáadáshoz
-CreateInvoiceForThisCustomerFromSendings=Számlaküldések
+CreateInvoiceForThisCustomerFromShippings=Számlaküldések
 IfValidateInvoiceIsNoSendingStayUnbilled=Ha a számla ellenőrzése „Nem”, akkor a küldés „Nem számlázva” állapotú marad mindaddig, amíg a számla nem érvényesül.
 OptionToSetSendingBilledNotEnabled=A Munkafolyamat modul opciója, hogy a küldést automatikusan "Számlázva" értékre állítsa, amikor a számla érvényesítve van, nincs engedélyezve, ezért manuálisan kell a küldések állapotát "Számlázva"-ra állítania. a számla létrejött.
 

htdocs/langs/id_ID/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Tidak ada produk untuk dikirim ditemukan di gudang
 WeightVolShort=Berat / Vol.
 ValidateOrderFirstBeforeShipment=Anda harus terlebih dahulu memvalidasi pesanan sebelum dapat melakukan pengiriman.
 NoLineGoOnTabToAddSome=Tidak ada baris, buka tab "%s" untuk menambahkan
-CreateInvoiceForThisCustomerFromSendings=Pengiriman tagihan
+CreateInvoiceForThisCustomerFromShippings=Pengiriman tagihan
 IfValidateInvoiceIsNoSendingStayUnbilled=Jika validasi invoice 'Tidak', pengiriman akan tetap berstatus 'Tidak Ditagih' hingga invoice divalidasi.
 OptionToSetSendingBilledNotEnabled=Opsi dari modul Alur Kerja, untuk menyetel pengiriman ke 'Ditagih' secara otomatis saat faktur divalidasi, tidak diaktifkan, jadi Anda harus menyetel status pengiriman ke 'Ditagih' secara manual setelah faktur dibuat.
 

htdocs/langs/it_IT/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Nessun prodotto da spedire presente all'interno de
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=È necessario convalidare l'ordine prima di poterlo spedire
 NoLineGoOnTabToAddSome=No linea, vai sulla scheda "%s" per aggiungere
-CreateInvoiceForThisCustomerFromSendings=Invii di fatture
+CreateInvoiceForThisCustomerFromShippings=Invii di fatture
 IfValidateInvoiceIsNoSendingStayUnbilled=Se la convalida fattura è 'No', l'invio rimarrà nello stato 'Non fatturato' fino alla convalida di fattura.
 OptionToSetSendingBilledNotEnabled=Opzione dal flusso di lavoro modulo, per impostare l'invio a 'fatturato' automaticamente quando fattura è convalidato, non è abilitato, quindi dovrai impostare lo stato degli invii su 'fatturato' manualmente dopo che fattura è stato generato.
 

htdocs/langs/kk_KZ/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=<b> %s </b> қоймасынан жіберіле
 WeightVolShort=Салмағы/том.
 ValidateOrderFirstBeforeShipment=Жеткізуді жасамас бұрын алдымен тапсырысты растауыңыз керек.
 NoLineGoOnTabToAddSome=Жол жоқ, қосу үшін "%s" қойындысына өтіңіз
-CreateInvoiceForThisCustomerFromSendings=Шот жіберу
+CreateInvoiceForThisCustomerFromShippings=Шот жіберу
 IfValidateInvoiceIsNoSendingStayUnbilled=Егер шот-фактураны растау «Жоқ» болса, шот-фактура расталғанға дейін жіберу «Төлемсіз» күйінде қалады.
 OptionToSetSendingBilledNotEnabled=Шот-фактура расталған кезде автоматты түрде "Есептелді" күйіне жіберуді орнату үшін Жұмыс процесі модулінің опциясы қосылмаған, сондықтан шот-фактура жасалғаннан кейін жіберу күйін "Есептелді" күйіне қолмен орнатуға тура келеді.
 

htdocs/langs/km_KH/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=រកមិនឃើញផលិតផលដែ
 WeightVolShort=ទម្ងន់/វ៉ុល។
 ValidateOrderFirstBeforeShipment=អ្នកត្រូវតែបញ្ជាក់ការបញ្ជាទិញជាមុនសិន មុននឹងអាចធ្វើការដឹកជញ្ជូនបាន។
 NoLineGoOnTabToAddSome=គ្មានបន្ទាត់ សូមចូលទៅកាន់ផ្ទាំង "%s" ដើម្បីបន្ថែម
-CreateInvoiceForThisCustomerFromSendings=ការផ្ញើវិក្កយបត្រ
+CreateInvoiceForThisCustomerFromShippings=ការផ្ញើវិក្កយបត្រ
 IfValidateInvoiceIsNoSendingStayUnbilled=ប្រសិនបើវិក្កយបត្រមានសុពលភាពគឺ 'ទេ' ការផ្ញើនឹងនៅតែស្ថិតក្នុងស្ថានភាព 'មិនទាន់ចេញវិក្កយបត្រ' រហូតដល់វិក្កយបត្រមានសុពលភាព។
 OptionToSetSendingBilledNotEnabled=ជម្រើសពីម៉ូឌុលការងារ ដើម្បីកំណត់ការផ្ញើទៅ 'បានចេញវិក្កយបត្រ' ដោយស្វ័យប្រវត្តិ នៅពេលដែលវិក្កយបត្រត្រូវបានផ្ទៀងផ្ទាត់ មិនត្រូវបានបើកទេ ដូច្នេះអ្នកនឹងត្រូវកំណត់ស្ថានភាពនៃការផ្ញើទៅ 'ចេញវិក្កយបត្រ' ដោយដៃ បន្ទាប់ពីវិក្កយបត្រត្រូវបានបង្កើត។
 

htdocs/langs/ko_KR/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=<b>%s</b>창고에 배송할 제품이 없습니
 WeightVolShort=무게/부피
 ValidateOrderFirstBeforeShipment=선적을 하려면 먼저 주문를 확인 처리해야 합니다.
 NoLineGoOnTabToAddSome=항목이 없습니다. 추가를 위해 탭 "%s"로 가세요
-CreateInvoiceForThisCustomerFromSendings=청구서 발송물
+CreateInvoiceForThisCustomerFromShippings=청구서 발송물
 IfValidateInvoiceIsNoSendingStayUnbilled=청구서 확인 처리 상태가 '안됨'이라면 발송물은 송장이 확인 처리 되기 전까지 '청구되지 않음'으로 남을 것입니다.
 OptionToSetSendingBilledNotEnabled=모듈 워크플로의 옵션, 송장이 확인 처리되었을 때 발송물을 '청구됨'으로 자동 설정하는 것이 불가합니다. 송장이 생성될 때 수동으로 발송물의 상태를 '청구됨'으로 변경해주세요.
 

htdocs/langs/lv_LV/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Noliktavā nav atrasts neviens produkts, kas pared
 WeightVolShort=Svars / tilp.
 ValidateOrderFirstBeforeShipment=Vispirms jums ir jāapstiprina pasūtījums, lai varētu veikt sūtījumus.
 NoLineGoOnTabToAddSome=Nav rindiņas, atveriet cilni %s, lai pievienotu
-CreateInvoiceForThisCustomerFromSendings=Rēķinu nosūtīšana
+CreateInvoiceForThisCustomerFromShippings=Rēķinu nosūtīšana
 IfValidateInvoiceIsNoSendingStayUnbilled=Ja rēķina apstiprināšana ir “Nē”, nosūtīšanas statuss būs “Bez rēķina”, līdz rēķins tiks apstiprināts.
 OptionToSetSendingBilledNotEnabled=Nav iespējota opcija no moduļa Workflow, lai pēc rēķina apstiprināšanas automātiski iestatītu sūtīšanu uz 'Rēķins', tāpēc pēc rēķina ģenerēšanas jums būs manuāli jāiestata sūtījumu statuss uz 'Rēķins'.
 

htdocs/langs/mk_MK/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. C
 WeightVolShort=Тежина/вол.
 ValidateOrderFirstBeforeShipment=Прво мора да ја потврдите нарачката пред да можете да вршите пратки.
 NoLineGoOnTabToAddSome=Нема линија, одете на картичката „%s“ за да додадете
-CreateInvoiceForThisCustomerFromSendings=Испраќање на сметки
+CreateInvoiceForThisCustomerFromShippings=Испраќање на сметки
 IfValidateInvoiceIsNoSendingStayUnbilled=Ако валидацијата на фактурата е „Не“, испраќањето ќе остане во статус „Нефактурирана“ додека не се потврди фактурата.
 OptionToSetSendingBilledNotEnabled=Опцијата од модулот Workflow, автоматски да го поставите испраќањето на „Наплатено“ кога фактурата е потврдена, не е овозможена, така што ќе мора рачно да го поставите статусот на испраќањето на „Наплатено“ откако ќе се генерира фактурата.
 

htdocs/langs/nb_NO/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Ingen varer som skal sendes i lager <b> %s </b>. K
 WeightVolShort=Vekt/volum
 ValidateOrderFirstBeforeShipment=Du må validere ordren før du kan utføre forsendelser
 NoLineGoOnTabToAddSome=Ingen linjer, gå til fanen "%s" for å legge til
-CreateInvoiceForThisCustomerFromSendings=Fakturautsendelser
+CreateInvoiceForThisCustomerFromShippings=Fakturautsendelser
 IfValidateInvoiceIsNoSendingStayUnbilled=Hvis faktura valideringen er 'Nei', vil sendingen forbli til status 'Ufakturert' til faktura er validert.
 OptionToSetSendingBilledNotEnabled=Alternativ fra modul Workflow, for å sette sending til "Fakturert" automatisk når faktura er validert, er ikke aktivert, så du må sette statusen for sendinger til "Fakturert" manuelt etter faktura er generert.
 

htdocs/langs/nl_NL/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Geen product te verzenden in het magazijn <b> %s <
 WeightVolShort=Gewicht / Vol.
 ValidateOrderFirstBeforeShipment=U moet eerst de bestelling valideren voordat u zendingen kunt maken.
 NoLineGoOnTabToAddSome=Geen regel. Ga naar tabblad "%s" om toe te voegen
-CreateInvoiceForThisCustomerFromSendings=Factuurverzendingen
+CreateInvoiceForThisCustomerFromShippings=Factuurverzendingen
 IfValidateInvoiceIsNoSendingStayUnbilled=Als de Factuur-validatie 'Nee' is, blijft de verzending op de status 'Niet gefactureerd' totdat de Factuur is gevalideerd.
 OptionToSetSendingBilledNotEnabled=De optie uit de module Workflow, om het verzenden automatisch naar 'Gefactureerd' in te stellen wanneer Factuur is gevalideerd, is niet ingeschakeld, dus u zult de status van verzendingen daarna handmatig moeten instellen op 'Gefactureerd' de Factuur is gegenereerd.
 

htdocs/langs/pl_PL/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=W magazynie <b>%s</b> nie znaleziono produktu do w
 WeightVolShort=Waga/Volumen
 ValidateOrderFirstBeforeShipment=W pierwszej kolejności musisz zatwierdzić zamówienie, aby mieć możliwość utworzenia wysyłki.
 NoLineGoOnTabToAddSome=Brak pozycji do wyświetlenia, przejdź do zakładki „%s”, aby je dodać
-CreateInvoiceForThisCustomerFromSendings=Bill sendings
+CreateInvoiceForThisCustomerFromShippings=Bill sendings
 IfValidateInvoiceIsNoSendingStayUnbilled=If invoice validation is 'No', the sending will remain to status 'Unbilled' until the invoice is validated.
 OptionToSetSendingBilledNotEnabled=Option from module Workflow, to set sending to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of sendings to 'Billed' manually after the invoice has been generated.
 

htdocs/langs/ro_RO/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Nu există niciun produs de livrat în depozitul <
 WeightVolShort=Greutate/Volum.
 ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda de vânzare înainte de a putea face livrări.
 NoLineGoOnTabToAddSome=Nicio linie/articol, mergi în fila "%s" pentru adăugare
-CreateInvoiceForThisCustomerFromSendings=Facturare expediții
+CreateInvoiceForThisCustomerFromShippings=Facturare expediții
 IfValidateInvoiceIsNoSendingStayUnbilled=Dacă validarea facturii este 'Nu', expedierea/livrarea va rămâne în starea 'Nefacturată' până când factura este validată.
 OptionToSetSendingBilledNotEnabled= Opțiunea din modulul Flux de lucru, pentru a seta automat trimiterea la 'Facturat' atunci când factura este validată, nu este activată, așa că va trebui să setezi manual starea trimiterilor la 'Facturat' după generarea facturii.
 

htdocs/langs/tg_TJ/sendings.lang

@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Дар анбор <b> %s </b> ягон маҳсу
 WeightVolShort=Вазн/ҷ.
 ValidateOrderFirstBeforeShipment=Пеш аз он ки шумо интиқол диҳед, шумо бояд аввал фармоишро тасдиқ кунед.
 NoLineGoOnTabToAddSome=Сатр нест, барои илова кардан ба ҷадвали "%s" гузаред
-CreateInvoiceForThisCustomerFromSendings=Bill sendings
+CreateInvoiceForThisCustomerFromShippings=Bill sendings
 IfValidateInvoiceIsNoSendingStayUnbilled=If invoice validation is 'No', the sending will remain to status 'Unbilled' until the invoice is validated.
 OptionToSetSendingBilledNotEnabled=Option from module Workflow, to set sending to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of sendings to 'Billed' manually after the invoice has been generated.