[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4044] trunk
- Subject: SF.net SVN: ledger-smb:[4044] trunk
- From: ..hidden..
- Date: Thu, 24 Nov 2011 09:32:20 +0000
Revision: 4044
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4044&view=rev
Author: einhverfr
Date: 2011-11-24 09:32:19 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Merging from 1.3
Modified Paths:
--------------
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/install.sh
Added Paths:
-----------
trunk/UI/Contact/pricelist.html
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4038
+ /branches/1.3:3711-4043
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-24 09:26:16 UTC (rev 4043)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-24 09:32:19 UTC (rev 4044)
@@ -981,6 +981,31 @@
_render_main_screen($company );
}
+=item pricelist
+
+This returns and displays the pricelist. The id field is required.
+
+=cut
+
+sub pricelist {
+ my ($request) = @_;
+ my $company = new_company($request);
+ $company->get();
+ $company->get_pricematrix();
+ my $template = LedgerSMB::Template->new(
+ user => $request->{_user},
+ path => 'UI/Contact' ,
+ template => 'pricelist',
+ format => 'HTML',
+ locale => $company->{_locale},
+ );
+
+ $template->render($request);
+}
+
+
+=item delete_price
+
=back
=head1 COPYRIGHT
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4038
/branches/1.3/scripts/admin.pl:3711-3903
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4043
/branches/1.3/scripts/admin.pl:3711-3903
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4038
/branches/1.3/scripts/employee.pl:3842-3843
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4043
/branches/1.3/scripts/employee.pl:3842-3843
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4038
/branches/1.3/scripts/payment.pl:3711-4011
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4043
/branches/1.3/scripts/payment.pl:3711-4011
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4038
/branches/1.3/scripts/setup.pl:3711-3967
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4043
/branches/1.3/scripts/setup.pl:3711-3967
Copied: trunk/UI/Contact/pricelist.html (from rev 4043, branches/1.3/UI/Contact/pricelist.html)
===================================================================
--- trunk/UI/Contact/pricelist.html (rev 0)
+++ trunk/UI/Contact/pricelist.html 2011-11-24 09:32:19 UTC (rev 4044)
@@ -0,0 +1,90 @@
+<?lsmb INCLUDE 'ui-header.html' ?>
+<?lsmb PROCESS 'elements.html' ?>
+<!--
+
+The overall structure here is imagined to be a list of individual price
+listings followed by the listings for the pricegroup. The reason for including
+both is simply that it makes it easier for someone to see what's going on when
+checking a price deal for a customer.
+
+-CT
+
+-->
+<body>
+<div class="listtop"><?lsmb text('Pricelist') ?></div>
+<table>
+<tr class="listheading">
+<th class="listheading"><?lsmb text('Partnumber') ?></th>
+<th class="listheading"><?lsmb text('Description') ?></th>
+<th class="listheading"><?lsmb IF accont_class == 1;
+ text('Last Cost');
+ ELSE;
+ text('Sell Price');
+ END ?></th>
+<?lsmb IF account_class == 2 ?>
+<th class="listheading"><?lsmb text('Valid From') ?></th>
+<th class="listheading"><?lsmb text('Valid To') ?></th>
+<?lsmb ELSE ?>
+<th class="listheading"><?lsmb text('Vendor Partnumber') ?></th>
+<th class="listheading"><?lsmb text('Lead Time') ?></th>
+<?lsmb END ?>
+<th class="listheading"><?lsmb text('Currency') ?></th>
+<th class="listheading"> </th>
+</tr>
+<?lsmb FOR pm IN pricematrix ?>
+<tr>
+<td><?lsmb pm.int_partnumber ?></td>
+<td><?lsmb pm.description ?></td>
+<td><?lsmb IF account_class == 1; pm.lastcost; ELSE; pm.sellprice; END ?>
+</td>
+<?lsmb IF account_class == 2; ?>
+<td><?lsmb pm.validfrom ?></td>
+<td><?lsmb pm.validto ?></td>
+<?lsmb ELSE ?>
+<td><?lsmb pm.partnumber ?></td>
+<td><?lsmb pm.leadtime ?></td>
+<?lsmb END ?>
+<td><?lsmb pm.currency ?></td>
+<td><a href="<?lsmb script ?>?action=delete_pricematrix&credit_id=<?lsmb id ?>&entry_id=<?lsmb pm.entry_id ?>">[<?lsmb text('Delete') ?>]</a></td>
+</tr>
+<?lsmb END # FOR pricematrix ?>
+</table>
+
+<?lsmb IF pricematrix_pricegroup ?>
+<div class="listtop"><?lsmb text('Pricelist for Pricegroup') ?></div>
+<table>
+<tr class="listheading">
+<th class="listheading"><?lsmb text('Partnumber') ?></th>
+<th class="listheading"><?lsmb text('Description') ?></th>
+<th class="listheading"><?lsmb IF accont_class == 1;
+ text('Last Cost');
+ ELSE;
+ text('Sell Price');
+ END ?></th>
+<?lsmb IF account_class == 2 ?>
+<th class="listheading"><?lsmb text('Valid From') ?></th>
+<th class="listheading"><?lsmb text('Valid To') ?></th>
+<?lsmb ELSE ?>
+<th class="listheading"><?lsmb text('Vendor Partnumber') ?></th>
+<th class="listheading"><?lsmb text('Lead Time') ?></th>
+<?lsmb END ?>
+<th class="listheading"><?lsmb text('Currency') ?></th>
+<?lsmb FOR pm IN pricematrix_pricegroup ?>
+<tr>
+<td><?lsmb pm.int_partnumber ?></td>
+<td><?lsmb pm.description ?></td>
+<td><?lsmb IF account_class == 1; pm.lastcost; ELSE; pm.sellprice; END ?>
+</td>
+<?lsmb IF account_class == 2; ?>
+<td><?lsmb pm.validfrom ?></td>
+<td><?lsmb pm.validto ?></td>
+<?lsmb ELSE ?>
+<td><?lsmb pm.partnumber ?></td>
+<td><?lsmb pm.leadtime ?></td>
+<?lsmb END ?>
+<td><?lsmb pm.currency ?></td>
+</table>
+<?lsmb END ?>
+<?lsmb END ?>
+</body>
+</html>
Modified: trunk/install.sh
===================================================================
--- trunk/install.sh 2011-11-24 09:26:16 UTC (rev 4043)
+++ trunk/install.sh 2011-11-24 09:32:19 UTC (rev 4044)
@@ -1,7 +1,17 @@
#!/bin/sh
+#./install.sh myLsmb13_test
+
CWD=`pwd`
+APACHE_ALIAS='ledgersmb'
+if [ $# -eq 1 ]
+then
+ APACHE_ALIAS=$1
+ echo "setting apache alias to $APACHE_ALIAS"
+fi
+
+
echo "Installing Perl Modules"
cpan Module::Install
@@ -12,7 +22,8 @@
echo "Configuring Apache"
-sed "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf
+#sed "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf
+sed "s|/ledgersmb|/$APACHE_ALIAS|g;s|WORKING_DIR|$CWD|g" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf
echo "Which user does your web server run as?"
read username
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4038
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4043
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.