//--------------------------------------------------------------------------------------
-function display_allocations($alloc_result, $total)
+function display_allocations($alloc_result, $total, $payments=false)
{
global $systypes_array;
if (!$alloc_result || db_num_rows($alloc_result) == 0)
return;
- display_heading2(_("Allocations"));
+ display_heading2(($payments ? _("Payments") : _("Allocations")));
start_table(TABLESTYLE, "width=80%");
label_cell(sql2date($alloc_row['tran_date']));
$alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
$alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
+ if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+ $alloc_row['Total'] = -$alloc_row['Total'];
amount_cell($alloc_row['Total']);
- //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']);
- amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+ amount_cell($alloc_row['Total'] - $alloc_row['amt']);
amount_cell($alloc_row['amt']);
end_row();
}
}
+//--------------------------------------------------------------------------------------
+
+function display_allocations_to($person_type, $person_id, $type, $type_no, $total)
+{
+ switch ($person_type)
+ {
+ case PT_CUSTOMER :
+ $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
+ display_allocations($alloc_result, $total, true);
+ return;
+ case PT_SUPPLIER :
+ $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
+ display_allocations($alloc_result, $total, true);
+ return;
+ }
+}
+
//--------------------------------------------------------------------------------------
//
// Expands selected quick entry $id into GL posings and adds to cart.
$ones = array("", "One", "Two", "Three", "Four", "Five", "Six",
"Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen",
- "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen",
+ "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen",
"Nineteen");
$tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty",
- "Seventy", "Eigthy", "Ninety");
+ "Seventy", "Eighty", "Ninety");
if ($Dn || $n)
{
$dec = user_price_dec();
if ($dec > 0)
{
- $divisor = pow(10, $dec);
- $frac = round2($amount - floor($amount), $dec) * $divisor;
- $frac = sprintf("%0{$dec}d", $frac);
+ $divisor = pow(10, $dec);
+ $frac = round2($amount - floor($amount), $dec) * $divisor;
+ $frac = sprintf("%0{$dec}d", round2($frac, 0));
$and = _("and");
$frac = " $and $frac/$divisor";
}
if (!file_exists($fpath) || $go_debug) {
- global $dateseps, $date_system;
+ global $dateseps, $date_system, $tmonths;
$how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
$sep = $dateseps[user_date_sep()]; // date separator
- $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
+ $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
$wno = _("W"); // week no
var selectedDay = 0;
var months = ['$months[0]','$months[1]','$months[2]','$months[3]','$months[4]','$months[5]','$months[6]','$months[7]','$months[8]','$months[9]','$months[10]','$months[11]'];
var wdays = ['$wdays[0]', '$wdays[1]', '$wdays[2]', '$wdays[3]', '$wdays[4]', '$wdays[5]', '$wdays[6]'];
+ var tmonths = ['$tmonths[0]','$tmonths[1]','$tmonths[2]','$tmonths[3]','$tmonths[4]','$tmonths[5]','$tmonths[6]','$tmonths[7]','$tmonths[8]','$tmonths[9]','$tmonths[10]','$tmonths[11]','$tmonths[12]'];
var dateField = null;
function getProperty(p_property){
var p_elm = calendarId;
this.getWeek = getWeek;
function getWeek(year, month, day) {
";
- if ($how == 0)
+ if ($how == 0 || $how == 3)
$js .= " day++;";
$js .= "
var date = new Date(year,month-1,day);
}
this.setDate = setDate;
function setDate(year, month, day) {
- if (dateField) {
+ if (dateField){
+";
+ if ($how < 3)
+ $js .= "
if (month < 10) {month = '0' + month;}
if (day < 10) {day = '0' + day;}
";
- if ($how == 0)
+ else
+ $js .= "
+ month = tmonths[month];
+";
+ if ($how == 0 || $how == 3)
$js .= "
var dateString = month+'$sep'+day+'$sep'+year;
";
- else if ($how == 1)
+ else if ($how == 1 || $how == 4)
$js .= "
var dateString = day+'$sep'+month+'$sep'+year;
";
- else
+ else if ($how == 2 || $how == 5)
$js .= "
var dateString = year+'$sep'+month+'$sep'+day;
";
selectedMonth = parseInt(dateParts[1],10);
selectedYear = parseInt(dateParts[2],10);
";
- else
+ else if ($how == 2)
$js .= "
selectedYear = parseInt(dateParts[0],10);
selectedMonth = parseInt(dateParts[1],10);
selectedDay = parseInt(dateParts[2],10);
+";
+ else if ($how == 3)
+ $js .= "
+ selectedDay = parseInt(dateParts[1],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10);
+ selectedYear = parseInt(dateParts[2],10);
+";
+ else if ($how == 4)
+ $js .= "
+ selectedDay = parseInt(dateParts[0],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+ selectedYear = parseInt(dateParts[2],10);
+";
+ else
+ $js .= "
+ selectedYear = parseInt(dateParts[0],10);
+ selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+ selectedDay = parseInt(dateParts[2],10);
";
$js .= "
} catch(e) {}
}
}
+//
+// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x
+//
+if (!isset($payment_services))
+{
+ $payment_services = array(
+ 'PayPal' => "https://www.paypal.com/xclick/business=<company_email>&item_name=<comment>&amount=<amount>¤cy_code=<currency>",
+ );
+}
+/*
+* Payment link generation. Options provided during invoice generation:
+* company_email, comment, amount, currency
+*/
+function payment_link($name, $options)
+{
+ global $payment_services;
+
+ $link = @$payment_services[$name];
+
+ if (!$link) return null;
+
+ $patterns = array();
+ foreach ($options as $id => $option)
+ $patterns['<'.$id.'>'] = urlencode($options[$id]);
+
+ return strtr($link, $patterns);
+}
+
?>
\ No newline at end of file