[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4623] trunk

Subject: SF.net SVN: ledger-smb:[4623] trunk
From: ..hidden..
Date: Wed, 28 Mar 2012 13:19:43 +0000
Revision: 4623
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4623&view=rev
Author:   einhverfr
Date:     2012-03-28 13:19:42 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Merging branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/UI/Contact/pricelist.html
    trunk/UI/Contact/pricelist.tex
    trunk/UI/lib/dynatable.tex

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/account.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/customer.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/file.pm
    trunk/LedgerSMB/Scripts/journal.pm
    trunk/LedgerSMB/Scripts/login.pm
    trunk/LedgerSMB/Scripts/menu.pm
    trunk/LedgerSMB/Scripts/payment.pm
    trunk/LedgerSMB/Scripts/recon.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/LedgerSMB/Scripts/vendor.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4619
   + /branches/1.3:3711-4621

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-03-28 13:19:10 UTC (rev 4622)
+++ trunk/Changelog	2012-03-28 13:19:42 UTC (rev 4623)
@@ -44,6 +44,7 @@
 * Corrected build issues w/Makefile due to inclusion of LedgerSMB.pm (Chris T)
 * ledgersmb.conf.default : Update default PATH (H Sorli, item 3430019)
 * Fixed imballanced payments when early payment discount processed (Chris T)
+* Pricelists exportable as PDF (Chris T)
 
 Chris B is Chris Bennet
 Chris T is Chris Travers


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4619
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4621
/branches/1.3/scripts/account.pl:3711-4368


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4619
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4621
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4619
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4621
/branches/1.3/scripts/customer.pl:4273-4287


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4619
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4621
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310


Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4619
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4621
/branches/1.3/scripts/file.pl:3711-4138


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4619
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4621
/branches/1.3/scripts/journal.pl:3711-4328


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4619
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4621
/branches/1.3/scripts/login.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4619
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4621
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4619
/branches/1.3/scripts/payment.pl:3711-4617
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4621
/branches/1.3/scripts/payment.pl:3711-4617


Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4619
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4621
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4619
/branches/1.3/scripts/setup.pl:3711-4550
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4621
/branches/1.3/scripts/setup.pl:3711-4550


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4619
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4621
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4619
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4621
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/UI/Contact/pricelist.html
===================================================================
--- trunk/UI/Contact/pricelist.html	2012-03-28 13:19:10 UTC (rev 4622)
+++ trunk/UI/Contact/pricelist.html	2012-03-28 13:19:42 UTC (rev 4623)
@@ -80,7 +80,9 @@
     name = "action"
     text = text('Save')
    value = "save_pricelist"
-} ?>
+} ?> <a href="customer.pl?action=pricelist&format=PDF&credit_id=<?lsmb 
+             credit_id ?>&entity_id=<?lsmb entity_id 
+     ?>">[<?lsmb text('PDF') ?>]</a>
 <?lsmb IF pricematrix_pricegroup;
      PROCESS dynatable
          tbody = { rows = pricematrix_pricegroup };

Modified: trunk/UI/Contact/pricelist.tex
===================================================================
--- trunk/UI/Contact/pricelist.tex	2012-03-28 13:19:10 UTC (rev 4622)
+++ trunk/UI/Contact/pricelist.tex	2012-03-28 13:19:42 UTC (rev 4623)
@@ -1,4 +1,4 @@
-<?lsmb  FILTER latex ?>
+<?lsmb   FILTER latex ?>
 \documentclass[a4paper]{article}
 \usepackage{longtable}
 \usepackage[margin=1cm]{geometry}
@@ -53,11 +53,13 @@
       PROCESS dynatable
     attributes = { id = 'pricematrix' }
          tbody = { rows = pricematrix }
+    firsthead = '\multicolumn{4}{l}{' _ text('Pricelist for [_1]', name)
+                  _ '}';
 
-   #IF pricematrix_pricegroup.size() > 0 ;
-   #  PROCESS dynatable
-   #      tbody = { rows = pricematrix_pricegroup };
-   #END;
+   IF pricematrix_pricegroup.size() > 0 ;
+     PROCESS dynatable
+         tbody = { rows = pricematrix_pricegroup };
+   END;
 -?>
 \end{document}
 <?lsmb  END ?>

Modified: trunk/UI/lib/dynatable.tex
===================================================================
--- trunk/UI/lib/dynatable.tex	2012-03-28 13:19:10 UTC (rev 4622)
+++ trunk/UI/lib/dynatable.tex	2012-03-28 13:19:42 UTC (rev 4623)
@@ -26,15 +26,14 @@
    ELSIF COL.palign;
         COL.palign;
    ELSE;
-        'r';
+        'l';
    END;
    IF COL.psep_after;
       '|';
    END;
 END; 
 -?>}
-<?lsmb- IF firsthead; firsthead ?>\\
-\endfirsthead
+<?lsmb IF firsthead; firsthead ?>\\
 <?lsmb- END ?>
 <?lsmb IF head; head ?>\\<?lsmb- END ?>
 <?lsmb- -?>
@@ -48,6 +47,17 @@
 END;
 -?>\\
 \hline\hline
+\endfirsthead
+<?lsmb 
+SKIP_TYPES = ['hidden', 'radio', 'checkbox'];
+
+FOREACH COL IN columns;
+    IF 0 == SKIP_TYPES.grep(COL.type).size();
+        COL.name _ ' & ';
+    END;
+END;
+-?>\\
+\hline\hline
 \endhead
 <?lsmb
 


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-4619
/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-4621
/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.
Prev by Date: SF.net SVN: ledger-smb:[4622] branches/1.3
Next by Date: SF.net SVN: ledger-smb:[4624] branches/1.3/LedgerSMB/Template
Previous by thread: SF.net SVN: ledger-smb:[4622] branches/1.3
Next by thread: SF.net SVN: ledger-smb:[4624] branches/1.3/LedgerSMB/Template
Index(es):
- Date
- Thread