Skip to content

Commit

Permalink
Merge pull request #9830 from frederic34/patch-17
Browse files Browse the repository at this point in the history
change class name from lettering to Lettering
  • Loading branch information
eldy committed Oct 23, 2018
2 parents 23a9416 + fe665a0 commit 652bef3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
3 changes: 2 additions & 1 deletion htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.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
Expand Down Expand Up @@ -88,7 +89,7 @@
}

$form = new Form($db);
$BookKeeping = new lettering($db);
$BookKeeping = new Lettering($db);
$formaccounting = new FormAccounting($db);

/*
Expand Down
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.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
Expand All @@ -21,7 +22,7 @@
*/

/**
* \file accountancy/bookkeeping/thirdparty_lettrage_supplier.php
* \file htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
* \ingroup Advanced accountancy
* \brief Tab to setup lettering
*/
Expand Down Expand Up @@ -92,7 +93,7 @@
}

$form = new Form($db);
$BookKeeping = new lettering($db);
$BookKeeping = new Lettering($db);
$formaccounting = new FormAccounting($db);

/*
Expand Down
14 changes: 8 additions & 6 deletions htdocs/accountancy/class/lettering.class.php
@@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.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
Expand All @@ -18,7 +19,7 @@
*/

/**
* \file accountancy/class/bookkeeping.class.php
* \file htdocs/accountancy/class/lettering.class.php
* \ingroup Advanced accountancy
* \brief File of class for lettering
*/
Expand All @@ -27,9 +28,9 @@
include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";

/**
* Class lettering
* Class Lettering
*/
class lettering extends BookKeeping
class Lettering extends BookKeeping
{
/**
* lettrageTiers
Expand All @@ -47,6 +48,7 @@ public function lettrageTiers($socid)
$object->id = $socid;
$object->fetch($socid);


if ($object->code_compta == '411CUSTCODE') {
$object->code_compta = '';
}
Expand Down

0 comments on commit 652bef3

Please sign in to comment.