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

improves the simplified payment

Browse Source 
MAIN_JS_ON_PAYMENT must be set
This commit is contained in:
cdelambert 2011-07-27 08:00:45 +00:00
parent 42e57dc1d2
commit 0320ade5bd
5 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/makepack-dolibarr.pl
View File

@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \version $Id: makepack-dolibarr.pl,v 1.116 2011/07/26 22:53:13 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.117 2011/07/26 23:25:59 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="$PROJECT_$MAJOR.$MINOR.$BUILD";
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") {
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.117 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -458,8 +458,8 @@ if ($nboftargetok) {
# now newbuild is 0-1 or 0-4 for example
print "Version is $MAJOR.$MINOR.$newbuild\n";
print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb");
print "Remove target ${FILENAMEDEB}_all.deb...\n";
unlink("$DESTI/${FILENAMEDEB}_all.deb");
#rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;

15
htdocs/compta/ajaxpayment.php
View File

@ -12,7 +12,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo
// from text inputs : total amount
$amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment)
: ''
)
)
: ''; // keep void if not a valid entry
// Checkamounts
foreach ($amounts as $key => $value)
@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown
// Get the current amount (from form) and the corresponding remainToPay (from invoice)
$currentAmount = $amounts['amount_'.$currentInvId];
$currentRemain = $remains['remain_'.$currentInvId];
// If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment
if($amountPayment == '')
{
@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown
$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
$result += $remainAmount; // result must be deduced by
$currentAmount += $remainAmount; // curAmount put to curRemain
}else
}else
{
$currentAmount = $currentRemain;
$result += $currentRemain;
}
}else
}
}else
{
// Reset the substraction for this amount
$result += price2num($currentAmount);
$currentAmount = 0;
if($result >= 0) // then we need to calculate the amount to breakdown
{
$amountToBreakdown = ($result - $currentRemain >= 0 ?

7
htdocs/compta/paiement.php
View File

@ -16,14 +16,15 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/compta/paiement.php
* \ingroup compta
* \brief Page to create a payment
* \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $
* \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
*/
require('../main.inc.php');
@ -672,5 +673,5 @@ if (! GETPOST('action'))
$db->close();
llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $');
llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $');
?>

19
htdocs/install/upgrade2.php
View File

@ -15,14 +15,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/upgrade2.php
* \brief Upgrade some data
* \version $Id: upgrade2.php,v 1.182 2011/07/27 17:34:43 eldy Exp $
* \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $
*/
include_once('./inc.php');
@ -306,7 +305,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// Reload menus
migrate_reload_menu($db,$langs,$conf,$versionto);
print $langs->trans("MigrationFinished");
print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
}
// Script for VX (X<3.1) -> V3.1
@ -324,7 +323,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// Reload menus
migrate_reload_menu($db,$langs,$conf,$versionto);
print $langs->trans("MigrationFinished");
print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
}
// On commit dans tous les cas.
@ -3176,12 +3175,18 @@ function migrate_delete_old_files($db,$langs,$conf)
DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php',
DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php',
DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php',
DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php',
DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone.lib.php',
DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_backoffice.php',
DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php',
DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php',
DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php',
DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php'
DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php',
DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php',
DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php'
);
foreach ($filetodeletearray as $filetodelete)
@ -3462,4 +3467,4 @@ update llx_facture set paye=1, fk_statut=2 where close_code is null
and rowid in (...)
*/
?>
?>

5
htdocs/lib/pdf.lib.php
View File

@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
@ -25,7 +24,7 @@
* \file htdocs/lib/pdf.lib.php
* \brief Set of functions used for PDF generation
* \ingroup core
* \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $
* \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $
*/