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

Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-02-05 12:28:15 +01:00
commit d93c71a42f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/compta.lang
View File

@ -85,6 +85,7 @@ PaymentCustomerInvoice=Customer invoice payment
PaymentSupplierInvoice=vendor invoice payment PaymentSupplierInvoice=vendor invoice payment
PaymentSocialContribution=Social/fiscal tax payment PaymentSocialContribution=Social/fiscal tax payment
PaymentVat=VAT payment PaymentVat=VAT payment
AutomaticCreationPayment=Automatically create a total payment
ListPayment=List of payments ListPayment=List of payments
ListOfCustomerPayments=List of customer payments ListOfCustomerPayments=List of customer payments
ListOfSupplierPayments=List of vendor payments ListOfSupplierPayments=List of vendor payments

6
htdocs/salaries/class/paymentsalary.class.php
View File

@ -577,9 +577,9 @@ class PaymentSalary extends CommonObject
{ {
if ($mode == 'payment_salary') if ($mode == 'payment_salary')
{ {
$socialcontrib = new Salary($this->db); $salary = new Salary($this->db);
$socialcontrib->fetch($key); $salary->fetch($key);
$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'salary'); $result = $acc->add_url_line($bank_line_id, $salary->id, DOL_URL_ROOT.'/salaries/card.php?id=', '('.$salary->label.')', 'salary');
if ($result <= 0) dol_print_error($this->db); if ($result <= 0) dol_print_error($this->db);
} }
} }