Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(facture-rec): fixed langs for prepaid and postpaid #553

Merged
merged 2 commits into from
Jan 17, 2025
Merged

fix(facture-rec): fixed langs for prepaid and postpaid #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac6013
fix(facture-rec): fixed langs for prepaid and postpaid
atm-irvine Jan 10, 2025
25489b5
clean params
atm-irvine Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion htdocs/compta/facture/class/facture-rec.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ public function create($user, $facid, $notrigger = 0)
if (empty($this->suspended)) {
$this->suspended = 0;
}
/** BACKPORT PR 32129 */
if (empty($this->rule_for_lines_dates)) {
$this->rule_for_lines_dates = 'prepaid';
}
/** BACKPORT PR 32129 */

// No frequency defined then no next date to execution
if (empty($this->frequency)) {
Expand Down Expand Up @@ -359,7 +364,7 @@ public function create($user, $facid, $notrigger = 0)
$sql .= ", ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL');
/**BACKPORT PR 31698**/
/** BACKPORT PR 32129 */
$sql .= ", ".(!empty($this->rule_for_lines_dates) ? ("'".$this->db->escape($this->rule_for_lines_dates)."'") : "NULL");
$sql .= ", '".$this->db->escape($this->rule_for_lines_dates)."'";
/** BACKPORT PR 32129 */
$sql .= ")";
if ($this->db->query($sql)) {
Expand Down
4 changes: 2 additions & 2 deletions htdocs/langs/fr_FR/compta.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,6 @@ ConfirmPreselectAccount=Présélectionner le code comptable
ConfirmPreselectAccountQuestion=Êtes-vous sûr de vouloir présélectionner les %s lignes sélectionnées avec ce code comptable ?
AmountPaidMustMatchAmountOfDownPayment=Le montant payé doit correspondre au montant de l'acompte
RuleForLinesDates=Règle pour les dates de lignes
Prepaid=Échu
Postpaid=À échoir
Prepaid=À échoir
Postpaid=Échu
SetRuleForLinesDates=Définir la règle pour les dates de lignes
Loading