Merge branch 'actiontriggers' of

https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang

dev/deduplicatefilelinesrecursively.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+# Recursively deduplicate file lines on a per file basis
+# Useful to deduplicate language files
+#
+# Needs awk 4.0 for the inplace fixing command
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]"
+fi
+
+# To detect
+if [ "x$1" = "xlist" ]
+then
+    for file in `find . -type f`
+    do
+        if [ `sort "$file" | uniq -d | wc -l` -gt 0 ]
+        then
+            echo "$file"
+        fi
+    done
+fi
+
+# To fix
+if [ "x$1" = "xfix" ]
+then
+    for file in `find . -type f`
+    do
+    	awk -i inplace ' !x[$0]++' "$file"
+    done;
+fi

dev/detectduplicatelangkey.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+# Helps find duplicate translation keys in language files
+#
+# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+for file in `find . -type f`
+do
+    dupes=$(
+    sed "s/^\s*//" "$file" | # Remove any leading whitespace
+    sed "s/\s*\=/=/" | # Remove any whitespace before =
+    grep -Po "(^.*?)=" | # Non greedeely match everything before =
+    sed "s/\=//" | # Remove trailing = so we get the key
+    sort | uniq -d # Find duplicates
+    )
+
+    if [ -n "$dupes" ]
+    then
+        echo "Duplicates found in $file"
+        echo "$dupes"
+    fi
+done

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -633,14 +633,12 @@ class InterfaceActionsAuto
         	$ok=1;
         }
 
-		// If not found
+		// The trigger was enabled but we are missing the implementation, let the log know
-        /*
 		else
 		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
+			dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.", LOG_WARNING);
 			return 0;
 		}
-        */
 
         // Add entry in event table
         if ($ok)

htdocs/install/mysql/data/llx_c_action_trigger.sql

@@ -7,6 +7,7 @@
 -- Copyright (C) 2007       Patrick Raguin          <patrick.raguin@gmail.com>
 -- Copyright (C) 2010-2013  Juanjo Menent           <jmenent@2byte.es>
 -- Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
+-- Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -59,3 +60,7 @@ insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang)
 insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
 insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29);
 insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (30,'PROJECT_CREATE','Project creation','Executed when a project is created','project',30);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34);

htdocs/install/mysql/migration/3.5.0-3.6.0.sql

@@ -1029,7 +1029,7 @@ create table llx_product_customer_price_log
  import_key			varchar(14)                  -- Import key
 )ENGINE=innodb;
 
---Batch number managment
+-- Batch number management
 ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL;
 
 CREATE TABLE llx_product_batch (
@@ -1055,7 +1055,7 @@ CREATE TABLE llx_expeditiondet_batch (
   KEY ix_fk_expeditiondet (fk_expeditiondet)
 ) ENGINE=InnoDB;
 
---Salary payment in tax module
+-- Salary payment in tax module
 --DROP TABLE llx_payment_salary
 CREATE TABLE llx_payment_salary (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
@@ -1076,11 +1076,11 @@ CREATE TABLE llx_payment_salary (
   fk_user_modif integer
 )ENGINE=innodb;
 
---New 1074 : Stock mouvement link to origin
+-- New 1074 : Stock mouvement link to origin
 ALTER TABLE llx_stock_mouvement ADD fk_origin integer;
 ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32);
 
---New 1300 : Add THM on user
+-- New 1300 : Add THM on user
 ALTER TABLE llx_user ADD thm double(24,8);
 ALTER TABLE llx_projet_task_time ADD thm double(24,8);
 
@@ -1108,3 +1108,9 @@ ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_barcode (barcode, fk_barcode
 
 ALTER TABLE llx_tva ADD COLUMN fk_typepayment integer NULL;	-- table may already contains data
 ALTER TABLE llx_tva ADD COLUMN num_payment varchar(50);
+
+-- Add missing action triggers
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33);
+insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34);

htdocs/langs/ar_SA/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=انسحاب الائتمان
 Notify_WITHDRAW_EMIT=Isue انسحاب
 Notify_ORDER_SENTBYMAIL=النظام العميل ترسل عن طريق البريد
 Notify_COMPANY_CREATE=طرف ثالث خلق
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=اقتراح التجارية المرسلة عن طريق البريد
 Notify_ORDER_SENTBYMAIL=النظام العميل ترسل عن طريق البريد
 Notify_BILL_PAYED=دفعت فاتورة العميل

htdocs/langs/bg_BG/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Оттегляне на кредитирането
 Notify_WITHDRAW_EMIT=Извършване на оттегляне
 Notify_ORDER_SENTBYMAIL=Поръчка на клиента, изпратено по пощата
 Notify_COMPANY_CREATE=Третата страна е създадена
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Търговско предложение, изпратено по пощата
 Notify_ORDER_SENTBYMAIL=Поръчка на клиента, изпратено по пощата
 Notify_BILL_PAYED=Фактурата на клиента е платена

htdocs/langs/bs_BA/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/ca_ES/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Abonament domiciliació
 Notify_WITHDRAW_EMIT=Emissió domiciliació
 Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail
 Notify_COMPANY_CREATE=Creació tercer
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Enviament pressupost per e-mail
 Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail
 Notify_BILL_PAYED=Cobrament factura a client

htdocs/langs/cs_CZ/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditní stažení
 Notify_WITHDRAW_EMIT=Proveďte stažení
 Notify_ORDER_SENTBYMAIL=Zákazníka zasílaný poštou
 Notify_COMPANY_CREATE=Třetí strana vytvořena
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Komerční návrh zaslat poštou
 Notify_ORDER_SENTBYMAIL=Zákazníka zasílaný poštou
 Notify_BILL_PAYED=Zákazník platí faktury

htdocs/langs/da_DK/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tilbagetrækning
 Notify_WITHDRAW_EMIT=Isue tilbagetrækning
 Notify_ORDER_SENTBYMAIL=Kundens ordre sendes med posten
 Notify_COMPANY_CREATE=Tredjeparts oprettet
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Kommercielle forslaget, som sendes med posten
 Notify_ORDER_SENTBYMAIL=Kundens ordre sendes med posten
 Notify_BILL_PAYED=Kundens faktura betales

htdocs/langs/de_DE/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditkarten Rücknahme
 Notify_WITHDRAW_EMIT=Ausgabe aussetzen
 Notify_ORDER_SENTBYMAIL=Kundenbestellung mit E-Mail versendet
 Notify_COMPANY_CREATE=Durch Dritte erstellt
-Notify_COMPANY_COMPANY_SENTBYMAIL=Von Partnern gesendete Mails
+Notify_COMPANY_SENTBYMAIL=Von Partnern gesendete Mails
 Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet
 Notify_ORDER_SENTBYMAIL=Kundenbestellung mit E-Mail versendet
 Notify_BILL_PAYED=Kundenrechnung bezahlt

htdocs/langs/el_GR/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Πιστωτικές απόσυρση
 Notify_WITHDRAW_EMIT=Εκτελέστε την απόσυρση
 Notify_ORDER_SENTBYMAIL=Για πελατών αποστέλλονται με το ταχυδρομείο
 Notify_COMPANY_CREATE=Τρίτο κόμμα δημιουργήθηκε
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Εμπορικές προτάσεις που αποστέλλονται ταχυδρομικώς
 Notify_ORDER_SENTBYMAIL=Για πελατών αποστέλλονται με το ταχυδρομείο
 Notify_BILL_PAYED=Τιμολογίου Πελατών payed

htdocs/langs/en_US/admin.lang

@@ -389,7 +389,6 @@ AllBarcodeReset=All barcode values have been removed
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 
-
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users and groups management

htdocs/langs/en_US/bills.lang

@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bank deposit
 PaymentTypeShortVIR=Bank deposit

htdocs/langs/en_US/cron.lang

@@ -1,22 +1,16 @@
 # Dolibarr language file - Source file is en_US - cron
 #
 # About page
-#
 About = About
 CronAbout = About Cron
 CronAboutPage = Cron about page
 
-#
 # Right
-#
 Permission23101 = Read Scheduled task
 Permission23102 = Create/update Scheduled task
 Permission23103 = Delete Scheduled task
 Permission23104 = Execute Scheduled task
-
-#
 # Admin
-#
 CronSetup= Scheduled job management setup
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
 OrToLaunchASpecificJob=Or to check and launch a specific job
@@ -24,20 +18,12 @@ KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes 
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
 # Menu
-#
 CronJobs=Scheduled jobs
 CronListActive= List of active jobs
 CronListInactive= List of disabled jobs
 CronListActive= List of scheduled jobs
-
-
-#
 # Page list
-#
 CronDateLastRun=Last run
 CronLastOutput=Last run output
 CronLastResult=Last result code
@@ -70,10 +56,7 @@ CronLabel=Description
 CronNbRun=Nb. launch
 CronEach=Every
 JobFinished=Job launched and finished
-
-#
 #Page card
-#
 CronAdd= Add jobs
 CronHourStart= Start Hour and date of task
 CronEvery= And execute task each
@@ -95,20 +78,12 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
-
-#
 # Info
-#
 CronInfoPage=Information
-
-
-#
 # Common
-#
 CronType=Task type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
-
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.

htdocs/langs/en_US/dict.lang

@@ -253,7 +253,6 @@ CivilityMR=Mr.
 CivilityMLE=Ms.
 CivilityMTRE=Master
 CivilityDR=Doctor
-
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=AU Dollars
@@ -290,10 +289,8 @@ CurrencyXOF=CFA Francs BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=CFP Francs
 CurrencySingXPF=CFP Franc
-
 CurrencyCentSingEUR=cent
 CurrencyThousandthSingTND=thousandth
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
@@ -306,7 +303,6 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
-
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0

htdocs/langs/en_US/errors.lang

@@ -2,7 +2,6 @@
 
 # No errors
 NoErrorCommitIsDone=No error, we commit
-
 # Errors
 Error=Error
 Errors=Errors
@@ -135,7 +134,6 @@ ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authe
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
 ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. 
-
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
 WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.

htdocs/langs/en_US/holiday.lang

@@ -34,7 +34,6 @@ ReturnCP=Return to previous page
 ErrorUserViewCP=You are not authorized to read this request for holidays.
 InfosCP=Information of the demand of holidays
 InfosWorkflowCP=Information Workflow
-DateCreateCP=Creation date
 RequestByCP=Requested by
 TitreRequestCP=Sheet of holidays
 NbUseDaysCP=Number of days of holidays consumed
@@ -130,7 +129,6 @@ ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
 TitleAdminCP=Configuration of Holidays
-
 #Messages
 Hello=Hello
 HolidaysToValidate=Validate holidays
@@ -143,7 +141,6 @@ HolidaysRefused=Denied holidays
 HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
 HolidaysCanceled=Canceled holidays
 HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-
 Permission20001=Read/create/modify their holidays
 Permission20002=Read/modify all requests of holidays
 Permission20003=Delete their holidays requests

htdocs/langs/en_US/install.lang

@@ -158,7 +158,6 @@ ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert
 
 #########
 # upgrade
-#########
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
 MigrationSupplierOrder=Data migration for supplier's orders

htdocs/langs/en_US/mails.lang

@@ -99,8 +99,6 @@ MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (
 MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
 MailingModuleDescMembersCategories=Foundation members (by categories)
 MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function)
-
-
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
@@ -128,7 +126,6 @@ TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature sending user
 TagMailtoEmail=Recipient EMail
-
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company

htdocs/langs/en_US/margins.lang

@@ -10,24 +10,18 @@ MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
 InputPrice=Input price
-
 margin=Profit margins management
 margesSetup=Profit margins management setup
-
 MarginDetails=Margin details
-
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
-
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-
 StartDate=Start date
 EndDate=End date
 Launch=Start
-
 ForceBuyingPriceIfNull=Force buying price if null
 ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,13 @@ UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
 MARGIN_TYPE=Margin type
 MargeBrute=Raw margin
 MargeNette=Net margin
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
 CostPrice=Cost price
 BuyingCost=Cost price
 UnitCharges=Unit charges
 Charges=Charges
-
 AgentContactType=Commercial agent contact type
 AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents

htdocs/langs/en_US/members.lang

@@ -86,7 +86,6 @@ SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
 AddMember=Add member
-MemberType=Member type
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail

htdocs/langs/en_US/orders.lang

@@ -101,7 +101,6 @@ RelatedOrders=Related orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
-CustomerOrder=Customer order
 RefCustomerOrderShort=Ref. cust. order
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
 Error_OrderNotChecked=No orders to invoice selected
-
-
 # Sources
 OrderSource0=Commercial proposal
 OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Commercial
 OrderSource6=Store
 QtyOrdered=Qty ordered
 AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
 # Documents models
 PDFEinsteinDescription=A complete order model (logo...)
 PDFEdisonDescription=A simple order model
@@ -155,7 +151,6 @@ OrderByFax=Fax
 OrderByEMail=EMail
 OrderByWWW=Online
 OrderByPhone=Phone
-
 CreateInvoiceForThisCustomer=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. 

htdocs/langs/en_US/other.lang

@@ -17,14 +17,15 @@ Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
 Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
 Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
 Notify_WITHDRAW_CREDIT=Credit withdrawal
 Notify_WITHDRAW_EMIT=Perform withdrawal
 Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
@@ -33,11 +34,13 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
 Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
 Notify_CONTRACT_VALIDATE=Contract validated
 Notify_FICHEINTER_VALIDATE=Intervention validated
 Notify_SHIPPING_VALIDATE=Shipping validated
 Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
 Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
 Notify_MEMBER_SUBSCRIPTION=Member subscribed
 Notify_MEMBER_RESILIATE=Member resiliated
 Notify_MEMBER_DELETE=Member deleted

htdocs/langs/en_US/sendings.lang

@@ -66,11 +66,9 @@ CarrierList=List of transporters
 SendingMethodCATCH=Catch by customer
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Simple document model for delivery receipts
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights

htdocs/langs/es_ES/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Abono domiciliación
 Notify_WITHDRAW_EMIT=Emisión domiciliación
 Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail
 Notify_COMPANY_CREATE=Creación tercero
-Notify_COMPANY_COMPANY_SENTBYMAIL=E-mail enviado desde la ficha del tercero
+Notify_COMPANY_SENTBYMAIL=E-mail enviado desde la ficha del tercero
 Notify_PROPAL_SENTBYMAIL=Envío presupuesto por e-mail
 Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail
 Notify_BILL_PAYED=Cobro factura a cliente

htdocs/langs/et_EE/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Krediidi väljamakse
 Notify_WITHDRAW_EMIT=Väljamakse teostamine
 Notify_ORDER_SENTBYMAIL=Müügitellimus saadetud postiga
 Notify_COMPANY_CREATE=Kolmas isik loodud
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Müügipakkumine saadetud postiga
 Notify_ORDER_SENTBYMAIL=Müügitellimus saadetud postiga
 Notify_BILL_PAYED=Müügiarve tasutud

htdocs/langs/eu_ES/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/fa_IR/other.lang

@@ -22,7 +22,7 @@ Notify_PROPAL_VALIDATE=التحقق من صحة اقتراح العملاء
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 Notify_ORDER_SENTBYMAIL=Envío pedido POR پست الکترونیک
 Notify_COMPANY_CREATE=شخص ثالث آفریده شده
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=پیشنهاد تجاری فرستاده شده توسط پست الکترونیکی
 Notify_ORDER_SENTBYMAIL=Envío pedido POR پست الکترونیک
 Notify_BILL_PAYED=صورتحساب مشتری payed

htdocs/langs/fi_FI/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Luotto peruuttaminen
 Notify_WITHDRAW_EMIT=Isue peruuttaminen
 Notify_ORDER_SENTBYMAIL=Asiakas tilaa postitse
 Notify_COMPANY_CREATE=Kolmannen osapuolen luotu
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Kaupallinen ehdotus lähetetään postitse
 Notify_ORDER_SENTBYMAIL=Asiakas tilaa postitse
 Notify_BILL_PAYED=Asiakas laskun maksanut

htdocs/langs/fr_FR/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Crédit prélèvement
 Notify_WITHDRAW_EMIT=Émission prélèvement
 Notify_ORDER_SENTBYMAIL=Envoi commande client par email
 Notify_COMPANY_CREATE=Tiers créé
-Notify_COMPANY_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers
+Notify_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers
 Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email
 Notify_ORDER_SENTBYMAIL=Envoi commande client par email
 Notify_BILL_PAYED=Recouvrement facture client

htdocs/langs/he_IL/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/hr_HR/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/hu_HU/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Hitel visszavonása
 Notify_WITHDRAW_EMIT=Isue visszavonása
 Notify_ORDER_SENTBYMAIL=Ügyfél érdekében postai úton
 Notify_COMPANY_CREATE=Harmadik fél létre
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail
 Notify_ORDER_SENTBYMAIL=Ügyfél érdekében postai úton
 Notify_BILL_PAYED=Az ügyfél számlát fizetni

htdocs/langs/id_ID/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/is_IS/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit afturköllun
 Notify_WITHDRAW_EMIT=Isue afturköllun
 Notify_ORDER_SENTBYMAIL=Viðskiptavinur röð send með pósti
 Notify_COMPANY_CREATE=Þriðja aðila til
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Auglýsing tillögu send með pósti
 Notify_ORDER_SENTBYMAIL=Viðskiptavinur röð send með pósti
 Notify_BILL_PAYED=Viðskiptavinur Reikningar borgað

htdocs/langs/it_IT/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Accredita prelievo
 Notify_WITHDRAW_EMIT=Esegui prelievo
 Notify_ORDER_SENTBYMAIL=Ordine cliente inviato per email
 Notify_COMPANY_CREATE=Creato soggetto terzo
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Proposta inviata per email
 Notify_ORDER_SENTBYMAIL=Ordine cliente inviato per email
 Notify_BILL_PAYED=Fattura attiva pagata

htdocs/langs/ja_JP/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=クレジット撤退
 Notify_WITHDRAW_EMIT=撤退を実行します。
 Notify_ORDER_SENTBYMAIL=Envío pedido POR電子メール
 Notify_COMPANY_CREATE=第三者が作成した
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
 Notify_ORDER_SENTBYMAIL=Envío pedido POR電子メール
 Notify_BILL_PAYED=顧客への請求はpayed

htdocs/langs/ko_KR/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/lt_LT/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/lv_LV/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kredīta izņemšana
 Notify_WITHDRAW_EMIT=Veikt atcelšanu
 Notify_ORDER_SENTBYMAIL=Klienta rīkojumam, kas nosūtīts pa pastu
 Notify_COMPANY_CREATE=Trešās puse izveidota
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Commercial priekšlikums nosūtīts pa pastu
 Notify_ORDER_SENTBYMAIL=Klienta rīkojumam, kas nosūtīts pa pastu
 Notify_BILL_PAYED=Klienta rēķins samaksāts

htdocs/langs/mk_MK/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/nb_NO/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tilbaketrekning
 Notify_WITHDRAW_EMIT=Isue tilbaketrekning
 Notify_ORDER_SENTBYMAIL=Kundeordre sendt i posten
 Notify_COMPANY_CREATE=Tredjeparts opprettet
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Kommersiell forslaget sendes med post
 Notify_ORDER_SENTBYMAIL=Kundeordre sendt i posten
 Notify_BILL_PAYED=Kunden faktura betales

htdocs/langs/nl_NL/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit terugtrekking
 Notify_WITHDRAW_EMIT=Isue terugtrekking
 Notify_ORDER_SENTBYMAIL=Bestelling van de klant per e-mail
 Notify_COMPANY_CREATE=Third party gemaakt
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Commercieel voorstel per e-mail
 Notify_ORDER_SENTBYMAIL=Bestelling van de klant per e-mail
 Notify_BILL_PAYED=Klant factuur betaald

htdocs/langs/pl_PL/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Wycofanie kredyt
 Notify_WITHDRAW_EMIT=Wycofanie Isue
 Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą
 Notify_COMPANY_CREATE=Trzeciej stworzone
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Gospodarczy wniosek przesłany pocztą
 Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą
 Notify_BILL_PAYED=Klient zapłaci faktury

htdocs/langs/pt_PT/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Retirada de crédito
 Notify_WITHDRAW_EMIT=Realizar a retirada
 Notify_ORDER_SENTBYMAIL=Pedido do cliente enviado pelo correio
 Notify_COMPANY_CREATE=Terceiro criado
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por correio
 Notify_ORDER_SENTBYMAIL=Pedido do cliente enviado pelo correio
 Notify_BILL_PAYED=Fatura de Cliente paga

htdocs/langs/ro_RO/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit de retragere
 Notify_WITHDRAW_EMIT=Isue retragere
 Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă
 Notify_COMPANY_CREATE=Terţ a creat
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă
 Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă
 Notify_BILL_PAYED=Factura platita clienţilor

htdocs/langs/ru_RU/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Кредитный выход
 Notify_WITHDRAW_EMIT=Isue вывода
 Notify_ORDER_SENTBYMAIL=Покупатель делает заказ по почте
 Notify_COMPANY_CREATE=Третья партия, созданная
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Коммерческое предложение по почте
 Notify_ORDER_SENTBYMAIL=Покупатель делает заказ по почте
 Notify_BILL_PAYED=Клиенту счет оплачен

htdocs/langs/sk_SK/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditné stiahnutiu
 Notify_WITHDRAW_EMIT=Preveďte stiahnutiu
 Notify_ORDER_SENTBYMAIL=Zákazníka zasielaný poštou
 Notify_COMPANY_CREATE=Tretia strana vytvorená
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Komerčné návrh zaslať poštou
 Notify_ORDER_SENTBYMAIL=Zákazníka zasielaný poštou
 Notify_BILL_PAYED=Zákazník platí faktúry

htdocs/langs/sl_SI/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Nakazilo kredita
 Notify_WITHDRAW_EMIT=Nakazilo izdatka
 Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti
 Notify_COMPANY_CREATE=Ustvarjen partner
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti
 Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti
 Notify_BILL_PAYED=Plačan račun kupca

htdocs/langs/sv_SE/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tillbakadragande
 Notify_WITHDRAW_EMIT=Isue tillbakadragande
 Notify_ORDER_SENTBYMAIL=Kundorder skickas per post
 Notify_COMPANY_CREATE=Tredje part som skapats
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Kommersiell förslag skickas per post
 Notify_ORDER_SENTBYMAIL=Kundorder skickas per post
 Notify_BILL_PAYED=Kundfaktura betalade

htdocs/langs/th_TH/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/tr_TR/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kredi çekme
 Notify_WITHDRAW_EMIT=Para çekme uygula
 Notify_ORDER_SENTBYMAIL=Müşteri siparişi posta ile gönderildi
 Notify_COMPANY_CREATE=Üçüncü parti oluşturuldu
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=Teklif posta ile gönderildi
 Notify_ORDER_SENTBYMAIL=Müşteri siparişi posta ile gönderildi
 Notify_BILL_PAYED=Müşteri faturası ödendi

htdocs/langs/uk_UA/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/uz_UZ/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/vi_VN/other.lang

@@ -22,7 +22,7 @@
 # Notify_WITHDRAW_EMIT=Perform withdrawal
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_COMPANY_CREATE=Third party created
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 # Notify_ORDER_SENTBYMAIL=Customer order sent by mail
 # Notify_BILL_PAYED=Customer invoice payed

htdocs/langs/zh_CN/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=信贷撤离
 Notify_WITHDRAW_EMIT=执行撤离
 Notify_ORDER_SENTBYMAIL=通过邮件发送的客户订单
 Notify_COMPANY_CREATE=第三方创建
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=通过邮件发送的商业提案
 Notify_ORDER_SENTBYMAIL=通过邮件发送的客户订单
 Notify_BILL_PAYED=客户发票payed

htdocs/langs/zh_TW/other.lang

@@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=信貸撤離
 Notify_WITHDRAW_EMIT=執行撤離
 Notify_ORDER_SENTBYMAIL=通過郵件發送的客戶訂單
 Notify_COMPANY_CREATE=第三方創建
-# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card
+# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_PROPAL_SENTBYMAIL=通過郵件發送的商業提案
 Notify_ORDER_SENTBYMAIL=通過郵件發送的客戶訂單
 Notify_BILL_PAYED=客戶發票payed