Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@eldy
eldy committed May 13, 2017
2 parents 5729bdb + 57ba598 commit 3c87399
Show file tree
Hide file tree
Showing 168 changed files with 13,901 additions and 100 deletions.
6 changes: 6 additions & 0 deletions .tx/config
View file
Expand Up @@ -338,6 +338,12 @@ source_file = htdocs/langs/en_US/stocks.lang
source_lang = en_US
type = MOZILLAPROPERTIES

[dolibarr.stripe]
file_filter = htdocs/langs/<lang>/stripe.lang
source_file = htdocs/langs/en_US/stripe.lang
source_lang = en_US
type = MOZILLAPROPERTIES

[dolibarr.suppliers]
file_filter = htdocs/langs/<lang>/suppliers.lang
source_file = htdocs/langs/en_US/suppliers.lang
Expand Down
1 change: 1 addition & 0 deletions COPYRIGHT
View file
Expand Up @@ -31,6 +31,7 @@ Restler 3.0.0RC6 LGPL-3+ Yes
TCPDF 6.2.12 LGPL-3+ Yes PDF generation
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
Swift Mailer 5.4.2-DEV MIT license Yes Comprehensive mailing tools for PHP
Stripe 4.7.0 MIT licence Yes Library for Stripe module

JS libraries:
jQuery 1.11.3 MIT License Yes JS library
Expand Down
1 change: 1 addition & 0 deletions build/rpm/dolibarr_fedora.spec
View file
Expand Up @@ -203,6 +203,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/public
%_datadir/dolibarr/htdocs/resource
%_datadir/dolibarr/htdocs/societe
%_datadir/dolibarr/htdocs/stripe
%_datadir/dolibarr/htdocs/supplier_proposal
%_datadir/dolibarr/htdocs/support
%_datadir/dolibarr/htdocs/theme
Expand Down
1 change: 1 addition & 0 deletions build/rpm/dolibarr_generic.spec
View file
Expand Up @@ -283,6 +283,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/public
%_datadir/dolibarr/htdocs/resource
%_datadir/dolibarr/htdocs/societe
%_datadir/dolibarr/htdocs/stripe
%_datadir/dolibarr/htdocs/supplier_proposal
%_datadir/dolibarr/htdocs/support
%_datadir/dolibarr/htdocs/theme
Expand Down
1 change: 1 addition & 0 deletions build/rpm/dolibarr_mandriva.spec
View file
Expand Up @@ -200,6 +200,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/public
%_datadir/dolibarr/htdocs/resource
%_datadir/dolibarr/htdocs/societe
%_datadir/dolibarr/htdocs/stripe
%_datadir/dolibarr/htdocs/supplier_proposal
%_datadir/dolibarr/htdocs/support
%_datadir/dolibarr/htdocs/theme
Expand Down
1 change: 1 addition & 0 deletions build/rpm/dolibarr_opensuse.spec
View file
Expand Up @@ -211,6 +211,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/public
%_datadir/dolibarr/htdocs/resource
%_datadir/dolibarr/htdocs/societe
%_datadir/dolibarr/htdocs/stripe
%_datadir/dolibarr/htdocs/supplier_proposal
%_datadir/dolibarr/htdocs/support
%_datadir/dolibarr/htdocs/theme
Expand Down
5 changes: 3 additions & 2 deletions htdocs/adherents/admin/public.php
View file
Expand Up @@ -179,7 +179,7 @@ function initfields()
print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
print "</td></tr>\n";

if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
{
// Jump to an online payment page
print '<tr class="oddeven" id="trpayment"><td>';
Expand All @@ -188,11 +188,12 @@ function initfields()
$listofval=array();
if (! empty($conf->paybox->enabled)) $listofval['paybox']='Paybox';
if (! empty($conf->paypal->enabled)) $listofval['paypal']='PayPal';
if (! empty($conf->stripe->enabled)) $listofval['stripe']='Stripe';
print $form->selectarray("MEMBER_NEWFORM_PAYONLINE",$listofval,(! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)?$conf->global->MEMBER_NEWFORM_PAYONLINE:''),1);
print "</td></tr>\n";
}

if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
{
// Jump to an online payment page
print '<tr class="oddeven" id="tremail"><td>';
Expand Down
7 changes: 7 additions & 0 deletions htdocs/adherents/subscription.php
View file
Expand Up @@ -869,6 +869,13 @@
print showPaypalPaymentUrl('membersubscription',$object->ref);
}

// Link for stripe payment
if (! empty($conf->stripe->enabled))
{
include_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
print showStripePaymentUrl('membersubscription',$object->ref);
}

}

/*
Expand Down
5 changes: 2 additions & 3 deletions htdocs/commande/stats/index.php
View file
Expand Up @@ -316,15 +316,14 @@
print '</tr>';

$oldyear=0;
$var=true;
foreach ($data as $val)
{
$year = $val['year'];
while (! empty($year) && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
print '<td align="right">0</td>';
print '<td align="right"></td>';
Expand All @@ -336,7 +335,7 @@
}


print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
print '<td align="right">'.$val['nb'].'</td>';
print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
Expand Down
8 changes: 4 additions & 4 deletions htdocs/compta/bank/bilan.php
View file
Expand Up @@ -69,22 +69,22 @@ function valeur($sql)

$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
$paiem = valeur($sql);
print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";


$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
$credits = valeur($sql);
print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";


$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
$debits = valeur($sql);
print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";


$sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
$solde = valeur($sql);
print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
print "<tr class=\"oddeven\"><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";


print "</table>";
Expand Down
18 changes: 10 additions & 8 deletions htdocs/compta/facture/card.php
View file
Expand Up @@ -3599,12 +3599,11 @@
print '</tr>';

$total_prev_ht = $total_prev_ttc = 0;
$var = true;
foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
$totalpaye = $prev_invoice->getSommePaiement();
$total_prev_ht += $prev_invoice->total_ht;
$total_prev_ttc += $prev_invoice->total_ttc;
print '<tr ' . $bc[$var] . '>';
print '<tr class="oddeven">';
print '<td>' . $prev_invoice->getNomUrl(1) . '</td>';
print '<td></td>';
if (! empty($conf->banque->enabled))
Expand All @@ -3614,10 +3613,9 @@
print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
print '</tr>';

$var = ! $var;
}

print '<tr ' . $bc[$var] . '>';
print '<tr class="oddeven">';
print '<td colspan="2" align="right"></td>';
print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
print '<td align="right"><b>' . price($total_prev_ttc) . '</b></td>';
Expand All @@ -3638,12 +3636,11 @@

$total_next_ht = $total_next_ttc = 0;

$var = true;
foreach ($object->tab_next_situation_invoice as $next_invoice) {
$totalpaye = $next_invoice->getSommePaiement();
$total_next_ht += $next_invoice->total_ht;
$total_next_ttc += $next_invoice->total_ttc;
print '<tr ' . $bc[$var] . '>';
print '<tr class="oddeven">';
print '<td>' . $next_invoice->getNomUrl(1) . '</td>';
print '<td></td>';
if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
Expand All @@ -3652,10 +3649,9 @@
print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
print '</tr>';

$var = ! $var;
}

print '<tr ' . $bc[$var] . '>';
print '<tr class="oddeven">';
print '<td colspan="2" align="right"></td>';
if (! empty($conf->banque->enabled)) print '<td align="right"></td>';

Expand Down Expand Up @@ -4240,6 +4236,12 @@
print showPaypalPaymentUrl('invoice', $object->ref);
}

// Link for stripe payment
if (! empty($conf->stripe->enabled) && $object->statut != 0) {
include_once DOL_DOCUMENT_ROOT . '/stripe/lib/stripe.lib.php';
print showStripePaymentUrl('invoice', $object->ref);
}

print '</div><div class="fichehalfright"><div class="ficheaddleft">';

// List of actions on element
Expand Down
5 changes: 2 additions & 3 deletions htdocs/compta/facture/stats/index.php
View file
Expand Up @@ -293,15 +293,14 @@
print '</tr>';

$oldyear=0;
$var=true;
foreach ($data as $val)
{
$year = $val['year'];
while ($year && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
print '<td align="right">0</td>';
print '<td align="right"></td>';
Expand All @@ -312,7 +311,7 @@
print '</tr>';
}

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
print '<td align="right">'.$val['nb'].'</td>';
print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
Expand Down
5 changes: 1 addition & 4 deletions htdocs/compta/journal/purchasesjournal.php
View file
Expand Up @@ -184,7 +184,6 @@
print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
print "</tr>\n";

$var=false;

$invoicestatic=new FactureFournisseur($db);
$companystatic=new Fournisseur($db);
Expand Down Expand Up @@ -229,7 +228,7 @@
{
if (isset($line['nomtcheck']) || $mt)
{
print "<tr ".$bc[$var]." >";
print '<tr class="oddeven">';
print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>";
print "<td>".$k."</td><td>".$line['label']."</td>";
Expand All @@ -249,8 +248,6 @@
}
}
}

$var = !$var;
}

print "</table>";
Expand Down
5 changes: 1 addition & 4 deletions htdocs/compta/journal/sellsjournal.php
View file
Expand Up @@ -216,7 +216,6 @@
print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
print "</tr>\n";

$var=false;

$invoicestatic=new Facture($db);
$companystatic=new Client($db);
Expand Down Expand Up @@ -262,7 +261,7 @@
{
if (isset($line['nomtcheck']) || $mt)
{
print "<tr ".$bc[$var]." >";
print '<tr class="oddeven">';
print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
print "<td>".$invoicestatic->getNomUrl(1)."</td>";
print "<td>".$k."</td><td>".$line['label']."</td>";
Expand All @@ -282,8 +281,6 @@
}
}
}

$var = !$var;
}

print "</table>";
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/paiement/rapport.php
View file
Expand Up @@ -145,7 +145,7 @@
print '<td align="right">'.$langs->trans("Size").'</td>';
print '<td align="right">'.$langs->trans("Date").'</td>';
print '</tr>';
$var=true;

if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
Expand All @@ -155,7 +155,7 @@

$tfile = $dir . '/'.$year.'/'.$file;
$relativepath = $year.'/'.$file;
print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>';
}
Expand Down
6 changes: 2 additions & 4 deletions htdocs/compta/prelevement/bons.php
View file
Expand Up @@ -129,14 +129,12 @@
print '</td>';
print '</tr>';

$var=True;

while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);

$obj = $db->fetch_object($result);

print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';

print $bon->LibStatut($obj->statut,2);
print "&nbsp;";
Expand Down
3 changes: 1 addition & 2 deletions htdocs/compta/prelevement/fiche-rejet.php
View file
Expand Up @@ -138,7 +138,6 @@
print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';

$var=True;
$total = 0;

if ($num > 0)
Expand All @@ -148,7 +147,7 @@
{
$obj = $db->fetch_object($resql);

print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';

print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
print img_picto('', 'statut'.$obj->statut).' ';
Expand Down
4 changes: 1 addition & 3 deletions htdocs/compta/prelevement/fiche-stat.php
View file
Expand Up @@ -127,13 +127,11 @@
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';

$var=false;

while ($i < $num)
{
$row = $db->fetch_row($resql);

print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';

print $ligne->LibStatut($row[1],1);

Expand Down
5 changes: 1 addition & 4 deletions htdocs/compta/prelevement/ligne.php
View file
Expand Up @@ -298,16 +298,13 @@
print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
print '</tr>';

$var=True;

$total = 0;

$var=false;
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($result);

print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';

print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
print img_object($langs->trans("ShowBill"),"bill");
Expand Down
8 changes: 2 additions & 6 deletions htdocs/compta/prelevement/list.php
View file
Expand Up @@ -159,15 +159,11 @@
print '</td>';
print '</tr>';

$var=True;

while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);


$obj = $db->fetch_object($result);

print "<tr ".$bc[$var]."><td>";
print '<tr class="oddeven"><td>';

print $ligne->LibStatut($obj->statut_ligne,2);
print "&nbsp;";
Expand Down

0 comments on commit 3c87399

Please sign in to comment.