lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: [ bug #1547 ] Untranslated Paiementfourn.class.php error messages

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-17 00:38:09 +02:00
parent 3f4978d786
commit 3e9ddbfcd0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/class/paiementfourn.class.php
View File

@ -203,7 +203,7 @@ class PaiementFourn extends Paiement
{ {
// Call trigger // Call trigger
$result=$this->call_trigger('PAYMENT_SUPPLIER_CREATE',$user); $result=$this->call_trigger('PAYMENT_SUPPLIER_CREATE',$user);
if ($result < 0) $error++; if ($result < 0) $error++;
// End call triggers // End call triggers
} }
} }
@ -255,7 +255,7 @@ class PaiementFourn extends Paiement
{ {
if (count($billsarray)) if (count($billsarray))
{ {
$this->error='Can\'t delete a payment shared by at least one invoice with status payed'; $this->error="ErrorCantDeletePaymentSharedWithPayedInvoice";
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
@ -274,7 +274,7 @@ class PaiementFourn extends Paiement
$accline->fetch($bank_line_id); $accline->fetch($bank_line_id);
if ($accline->rappro) if ($accline->rappro)
{ {
$this->error='Impossible de supprimer un paiement qui a genere une ecriture qui a ete rapprochee'; $this->error="ErrorCantDeletePaymentReconciliated";
$this->db->rollback(); $this->db->rollback();
return -3; return -3;
} }

2
htdocs/langs/en_US/errors.lang
View File

@ -136,6 +136,8 @@ ErrorBadFormat=Bad format!
ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
# Warnings # Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined