Skip to content
Snippets Groups Projects
Commit ef4bdcdb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into develop

parents 01209ff8 86e04cb6
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/langs/en_US/withdrawals.lang
+ 1
− 2
View file @ ef4bdcdb
...@@ -41,14 +41,13 @@ TransMetod=Transmission method ...@@ -41,14 +41,13 @@ TransMetod=Transmission method
Send=Send Send=Send
Lines=Lines Lines=Lines
StandingOrderReject=Issue a rejection StandingOrderReject=Issue a rejection
InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection RefusedData=Date of rejection
RefusedReason=Reason for rejection RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection NoInvoiceRefused=Do not charge the rejection
InvoiceRefused=Charge the rejection to customer InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status Status=Status
StatusUnknown=Unknown StatusUnknown=Unknown
StatusWaiting=Waiting StatusWaiting=Waiting
......
htdocs/product/stock/card.php
+ 3
− 3
View file @ ef4bdcdb
test/phpunit/FunctionsLibTest.php
+ 16
− 16
View file @ ef4bdcdb
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment