[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4951] trunk
- Subject: SF.net SVN: ledger-smb:[4951] trunk
- From: ..hidden..
- Date: Fri, 29 Jun 2012 06:30:28 +0000
Revision: 4951
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4951&view=rev
Author: einhverfr
Date: 2012-06-29 06:30:28 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/IS.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/User.pm
trunk/bin/ic.pl
trunk/bin/io.pl
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/taxform.pm
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4945
+ /branches/1.3:3711-4950
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/Changelog 2012-06-29 06:30:28 UTC (rev 4951)
@@ -66,6 +66,10 @@
* Demo templates provide better handling of paragraph breaks in notes (Chris T)
* Fixed menu anomilies due to menu grants on sub-menus (Chris T)
* Fixed unable to change order or delete it (Chris T, 3535856)
+* Fixed invalid syntax for integer on saving employee (Chris T)
+* Cleaned up dates lines on employee screen (Chris T)
+* Added access to parts.image for ar invoice, order, quote templates (Chris T)
+* Fixed error on redirect from attaching file to part (Chris T h/t Brian W)
Changelog for 1.3.19
* New link for customer/vendor when not a dropdown (Chris T)
Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/LedgerSMB/IS.pm 2012-06-29 06:30:28 UTC (rev 4951)
@@ -2130,7 +2130,7 @@
p.income_accno_id, p.expense_accno_id, pg.partsgroup,
p.partsgroup_id, p.partnumber AS sku, p.weight,
t1.description AS translation,
- t2.description AS grouptranslation
+ t2.description AS grouptranslation, p.image
FROM parts p
LEFT JOIN makemodel mm ON (mm.parts_id = p.id AND mm.barcode = |
. $dbh->quote($form->{"partnumber_$i"}) . qq|)
Modified: trunk/LedgerSMB/Scripts/taxform.pm
===================================================================
--- trunk/LedgerSMB/Scripts/taxform.pm 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/LedgerSMB/Scripts/taxform.pm 2012-06-29 06:30:28 UTC (rev 4951)
@@ -136,7 +136,7 @@
# TODO: Eliminate duplicate code!
if ($request->{meta_number}) {
my @call_args = ($request->{'tax_form_id'},
- $request->{begin_month}.' '.$request->{begin_day}.' '.$request->{begin_year}, $request->{end_month}.' '.$request->{end_day}.' '.$request->{end_year},
+ $request->{begin_year}.'-'.$request->{begin_month}.'-'.$request->{begin_day}, $request->{end_year}.'-'.$request->{end_month}.'-'.$request->{end_day},
$request->{meta_number});
my @results = $request->call_procedure(procname => 'tax_form_details_report', args => ..hidden..);
@@ -178,7 +178,7 @@
}
else {
- my @call_args = ($request->{'tax_form_id'}, $request->{begin_month}.' '.$request->{begin_day}.' '.$request->{begin_year}, $request->{end_month}.' '.$request->{end_day}.' '.$request->{end_year});
+ my @call_args = ($request->{'tax_form_id'}, $request->{begin_year}.'-'.$request->{begin_month}.'-'.$request->{begin_day}, $request->{end_year}.'-'.$request->{end_month}.'-'.$request->{end_day});
my @results = $request->call_procedure(procname => 'tax_form_summary_report', args => ..hidden..);
for my $r (@results){
my $company = LedgerSMB::DBObject::Vendor->new(base => $request);
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4945
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4945
/branches/1.3/scripts/taxform.pl:3711-4950
Modified: trunk/LedgerSMB/User.pm
===================================================================
--- trunk/LedgerSMB/User.pm 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/LedgerSMB/User.pm 2012-06-29 06:30:28 UTC (rev 4951)
@@ -195,6 +195,15 @@
$sth = $dbh->prepare("SELECT value FROM defaults WHERE setting_key = 'templates'");
$sth->execute();
($templates) = $sth->fetchrow_array() || 'demo';
+ my %date_query = (
+ 'mm/dd/yy' => 'set DateStyle to \'SQL, US\'',
+ 'mm-dd-yy' => 'set DateStyle to \'POSTGRES, US\'',
+ 'dd/mm/yy' => 'set DateStyle to \'SQL, EUROPEAN\'',
+ 'dd-mm-yy' => 'set DateStyle to \'POSTGRES, EUROPEAN\'',
+ 'dd.mm.yy' => 'set DateStyle to \'GERMAN\''
+ );
+ $dbh->do( $date_query{ $myconfig{dateformat} } );
+
$myconfig->{templates} = "$LedgerSMB::Sysconfig::templates/$templates";
bless $myconfig, __PACKAGE__;
return $myconfig;
Modified: trunk/bin/ic.pl
===================================================================
--- trunk/bin/ic.pl 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/bin/ic.pl 2012-06-29 06:30:28 UTC (rev 4951)
@@ -935,7 +935,7 @@
print qq|
</table>|;
$callback = $form->escape(
- lc($form->{ARAP}) . ".pl?action=edit&id=".$form->{id}
+ "ic.pl?action=edit&id=".$form->{id}
);
print qq|
<a href="file.pl?action=show_attachment_screen&ref_key=$form->{id}&file_class=3&callback=$callback"
Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl 2012-06-29 06:24:45 UTC (rev 4950)
+++ trunk/bin/io.pl 2012-06-29 06:30:28 UTC (rev 4951)
@@ -415,7 +415,7 @@
|;
for (
- qw(orderitems_id id bin weight listprice lastcost taxaccounts pricematrix sku onhand assembly inventory_accno_id income_accno_id expense_accno_id invoice_id precision)
+ qw(image orderitems_id id bin weight listprice lastcost taxaccounts pricematrix sku onhand assembly inventory_accno_id income_accno_id expense_accno_id invoice_id precision)
)
{
$form->hide_form("${_}_$i");
@@ -606,7 +606,7 @@
qw(partnumber sku description partsgroup partsgroup_id bin weight
sellprice listprice lastcost onhand unit assembly
taxaccounts inventory_accno_id income_accno_id expense_accno_id
- pricematrix id notes)
+ pricematrix id image notes)
)
{
print
@@ -672,7 +672,7 @@
for (
qw(id partnumber sku description listprice lastcost
bin unit weight assembly taxaccounts pricematrix onhand notes
- inventory_accno_id income_accno_id expense_accno_id)
+ inventory_accno_id image income_accno_id expense_accno_id)
)
{
$form->{"${_}_$i"} = $form->{"new_${_}_$j"};
@@ -763,7 +763,7 @@
for (
qw(id partnumber sku description sellprice listprice lastcost
bin unit weight assembly taxaccounts pricematrix onhand
- notes inventory_accno_id income_accno_id expense_accno_id)
+ notes inventory_accno_id income_accno_id expense_accno_id image)
)
{
delete $form->{"new_${_}_$i"};
@@ -929,7 +929,7 @@
sellprice discount oldqty orderitems_id bin weight listprice
lastcost taxaccounts pricematrix sku onhand assembly
inventory_accno_id income_accno_id expense_accno_id notes reqdate
- deliverydate serialnumber projectnumber);
+ deliverydate serialnumber projectnumber image);
# remove any makes or model rows
if ( $form->{item} eq 'part' ) {
@@ -1667,7 +1667,8 @@
"partnumber_$i", "description_$i",
"projectnumber_$i", "partsgroup_$i",
"serialnumber_$i", "bin_$i",
- "unit_$i", "notes_$i"
+ "unit_$i", "notes_$i",
+ "image_$i",
);
}
for ( split / /, $form->{taxaccounts} ) { push @vars, "${_}_description" }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.