This list is closed, nobody may subscribe to it.
2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <vv...@us...> - 2015-02-17 20:14:35
|
Revision: 7155 http://sourceforge.net/p/web-erp/reponame/7155 Author: vvs2012 Date: 2015-02-17 20:14:32 +0000 (Tue, 17 Feb 2015) Log Message: ----------- Added print.css Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/GLProfit_Loss.php trunk/GLTrialBalance.php trunk/doc/Change.log trunk/includes/header.inc Added Paths: ----------- trunk/css/print.css Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLBalanceSheet.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -384,7 +384,7 @@ chartdetails.accountcode"; $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/preview.gif" title="' . _('Search') . '" alt="" /> ' . _('HTML View') . '</p>'; + echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/preview.gif" title="' . _('Search') . '" alt="" /> ' . _('HTML View') . '</p>'; echo '<div class="invoice"> <table class="selection"> @@ -701,7 +701,7 @@ echo '</table>'; echo '</div>'; - echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>'; + echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>'; echo '</div></form>'; } Modified: trunk/GLProfit_Loss.php =================================================================== --- trunk/GLProfit_Loss.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLProfit_Loss.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -608,7 +608,8 @@ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>'; + echo '<p class="page_title_text"><img class="noprint" src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" /> + <h2>' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</h2></p>'; /*show a table of the accounts info returned by the SQL Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */ @@ -1290,7 +1291,7 @@ <td colspan="6"><hr /></td> </tr>'; echo '</table>'; - echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>'; + echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>'; } echo '</div>'; echo '</form>'; Modified: trunk/GLTrialBalance.php =================================================================== --- trunk/GLTrialBalance.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLTrialBalance.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -435,7 +435,7 @@ $AccountsResult = DB_query($SQL, _('No general ledger accounts were returned by the SQL because'), _('The SQL that failed was:')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . + echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Trial Balance') . '" alt="" />' . ' ' . _('Trial Balance Report') . '</p>'; /*show a table of the accounts info returned by the SQL @@ -727,7 +727,7 @@ locale_number_format($CheckPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces'])); echo '</table><br />'; - echo '<div class="centre"> + echo '<div class="centre noprint"> <input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /> </div>'; } Added: trunk/css/print.css =================================================================== --- trunk/css/print.css (rev 0) +++ trunk/css/print.css 2015-02-17 20:14:32 UTC (rev 7155) @@ -0,0 +1,67 @@ +@media print { + +#HeaderDiv {display:none;} +#FooterDiv {display:none;} +#MainMenuDiv {display:none;} +.noprint {display:none;} + +#content p { + color: black; +} + +#content img { + display:block; + page-break-after: avoid; + page-break-inside: avoid; +} + +#content ul, li { + display:block; + page-break-inside:avoid; +} + +hr { + color: black; +} + +a { + color:navy; + text-decoration:none; +} + +#CanvasDiv, body { + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size:11pt; + background: white; + background-image: none; + margin: 0; + border: none; + border-radius: 0; + padding: 0; + box-shadow: none; +} + +#BodyDiv { + background: white; + background-image: none; + width: 100%; + margin: 0; + float: none; + border: none; + border-radius: 0; + padding: 0; + box-shadow: none; +} + +#BodyDiv table{ + background: white; + border: none; + padding: 0; + box-shadow: none; + border-radius:0; +} + +.site-description {display:none;} +.site-title {display:none;} + +} Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/doc/Change.log 2015-02-17 20:14:32 UTC (rev 7155) @@ -1,5 +1,6 @@ webERP Change Log +17/2/15 Vitaly: Added print.css to allow printing pages off the screen 15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. 12/2/15 RChacon: Fix on PrintCustTransPortrait.php: Do not need to escape special characters in a string for use in an SQL statement. 11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations Modified: trunk/includes/header.inc =================================================================== --- trunk/includes/header.inc 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/includes/header.inc 2015-02-17 20:14:32 UTC (rev 7155) @@ -37,7 +37,8 @@ } else { echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />'; } - echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" />'; + echo '<link href="' . $RootPath . '/css/print.css" rel="stylesheet" type="text/css" media="print" />'; + echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" media="screen"/>'; echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>'; echo '</head>'; echo '<body>'; |
From: <rc...@us...> - 2015-02-17 18:32:26
|
Revision: 7154 http://sourceforge.net/p/web-erp/reponame/7154 Author: rchacon Date: 2015-02-17 18:32:23 +0000 (Tue, 17 Feb 2015) Log Message: ----------- Spanish translation improvement. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-17 13:54:22 UTC (rev 7153) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-17 18:32:23 UTC (rev 7154) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-06 19:17+1300\n" -"PO-Revision-Date: 2015-02-09 17:02-0600\n" +"PO-Revision-Date: 2015-02-17 12:27-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -6733,7 +6733,7 @@ #: CounterReturns.php:1602 Credit_Invoice.php:1504 SelectCreditItems.php:2008 msgid "Credit Note number" -msgstr "abono No." +msgstr "Número de nota de crédito" #: CounterReturns.php:1607 CounterReturns.php:1609 Credit_Invoice.php:1506 #: Credit_Invoice.php:1508 @@ -7300,7 +7300,7 @@ #: Credit_Invoice.php:287 msgid "Credit Invoice" -msgstr "Acreditar Factura" +msgstr "Acreditar factura" #: Credit_Invoice.php:289 msgid "Credit Note amounts stated in" @@ -7351,7 +7351,7 @@ #: Credit_Invoice.php:431 msgid "Credit Freight Cost" -msgstr "Costo transporte credito" +msgstr "Acreditar costo del flete" #: Credit_Invoice.php:479 SelectCreditItems.php:843 msgid "Credit Totals" @@ -7528,7 +7528,7 @@ #: Credit_Invoice.php:1519 SelectCreditItems.php:856 msgid "Credit Note Type" -msgstr "Tipo de Abono" +msgstr "Tipo de nota de crédito" #: Credit_Invoice.php:1523 Credit_Invoice.php:1528 Credit_Invoice.php:1532 #: SelectCreditItems.php:860 SelectCreditItems.php:865 @@ -11495,7 +11495,7 @@ #: EDIMessageFormat.php:6 msgid "EDI Message Format" -msgstr "Formato de Mensaje EDI" +msgstr "Formato de mensaje EDI" #: EDIMessageFormat.php:43 msgid "" @@ -12004,7 +12004,7 @@ #: EDISendInvoices.php:228 EDISendInvoices.php:231 EDISendInvoices.php:246 #: EDISendInvoices_Reece.php:316 EDISendInvoices_Reece.php:319 msgid "EDI Message" -msgstr "Mensaje Electrónico" +msgstr "Mensaje EDI" #: EDISendInvoices.php:228 msgid "was successfully emailed" @@ -13413,11 +13413,11 @@ #: FormDesigner.php:352 msgid "End x co-ordinate" -msgstr "Coordenada X Final" +msgstr "Coordenada X final" #: FormDesigner.php:353 msgid "End y co-ordinate" -msgstr "Coordenada Y Final" +msgstr "Coordenada Y final" #: FormDesigner.php:365 msgid "Preview the Form Layout" @@ -17726,7 +17726,7 @@ #: MRP.php:15 msgid "Start time" -msgstr "Fecha de Inicio" +msgstr "Fecha inicial" #: MRP.php:16 msgid "Initialising tables ....." @@ -20217,7 +20217,7 @@ #: PrintCustTrans.php:543 PrintCustTrans.php:545 #: PrintCustTransPortrait.php:575 PrintCustTransPortrait.php:577 msgid "Credit Notes" -msgstr "Abonos" +msgstr "Notas de crédito" #: PDFCustTransListing.php:84 PDFPeriodStockTransListing.php:139 msgid "An error occurred getting the transactions" @@ -23342,7 +23342,7 @@ #: PricesByCost.php:157 Prices_Customer.php:358 Prices.php:224 #: SelectRecurringSalesOrder.php:95 msgid "End Date" -msgstr "Fecha Final" +msgstr "Fecha final" #: PricesByCost.php:160 msgid "Price Proposed" @@ -23860,7 +23860,7 @@ #: PrintCustTrans.php:66 PrintCustTransPortrait.php:65 msgid "Credit Notes from" -msgstr "Abonos desde" +msgstr "Notas de crédito desde" #: PrintCustTrans.php:223 PrintCustTrans.php:278 #: PrintCustTransPortrait.php:245 PrintCustTransPortrait.php:303 @@ -23955,33 +23955,33 @@ #: PrintCustTrans.php:539 PrintCustTransPortrait.php:569 #: includes/MainMenuLinksArray.php:104 msgid "Print Invoices or Credit Notes" -msgstr "Imprimir Facturas ó Abonos" +msgstr "Imprimir facturas o notas de crédito" #: PrintCustTrans.php:550 PrintCustTransPortrait.php:584 msgid "Print EDI Transactions" -msgstr "Imprimir transacciones edi" +msgstr "Imprimir transacciones EDI" #: PrintCustTrans.php:554 PrintCustTrans.php:559 #: PrintCustTransPortrait.php:589 PrintCustTransPortrait.php:594 msgid "Do not Print PDF EDI Transactions" -msgstr "No imprimir transacciones edi" +msgstr "No imprimir transacciones EDI" #: PrintCustTrans.php:555 PrintCustTrans.php:560 #: PrintCustTransPortrait.php:590 PrintCustTransPortrait.php:595 msgid "Print PDF EDI Transactions Too" -msgstr "Ademas imprimir transacciones edi" +msgstr "También imprimir transacciones EDI" #: PrintCustTrans.php:564 PrintCustTransPortrait.php:602 msgid "Start invoice/credit note number to print" -msgstr "Imprimir Facturas/Abonos desde" +msgstr "Imprimir factura/nota de crédito desde" #: PrintCustTrans.php:566 PrintCustTransPortrait.php:606 msgid "End invoice/credit note number to print" -msgstr "Último número de Factura/Abono a Imprimir" +msgstr "Imprimir factura/nota de crédito hasta" #: PrintCustTrans.php:577 PrintCustTransPortrait.php:622 msgid "The last invoice created was number" -msgstr "La última Factura generada fue la nº" +msgstr "La última factura creada fue la número" #: PrintCustTrans.php:577 PrintCustTransPortrait.php:622 msgid "If only a single invoice is required" @@ -24006,7 +24006,7 @@ #: PrintCustTrans.php:584 PrintCustTransPortrait.php:629 msgid "The last credit note created was number" -msgstr "El ultimo Abono fue:" +msgstr "La última nota de crédito creada fue la número" #: PrintCustTrans.php:585 PrintCustTransPortrait.php:629 msgid "" @@ -24047,7 +24047,7 @@ #: PrintCustTransPortrait.php:773 PrintCustTransPortrait.php:1021 #: PrintCustTransPortrait.php:1076 includes/PDFTransPageHeaderPortrait.inc:22 msgid "TAX CREDIT NOTE" -msgstr "Abono Impuestos" +msgstr "Nota de crédito" #: PrintCustTrans.php:733 PrintCustTransPortrait.php:776 msgid "Tax Authority Ref" @@ -24097,7 +24097,7 @@ #: PrintCustTransPortrait.php:565 msgid "Print Invoices or Credit Notes (Portrait Mode)" -msgstr "Imprimir Facturas o Abonos (en vertical)" +msgstr "Imprimir facturas o notas de crédito (modo vertical)" #: PrintCustTransPortrait.php:612 msgid "Print Preview" @@ -27303,7 +27303,7 @@ #: SelectCreditItems.php:797 msgid "Credit Freight" -msgstr "Crédito de Transporte" +msgstr "Acreditar flete" #: SelectCreditItems.php:862 SelectCreditItems.php:866 msgid "Reverse an Overcharge" @@ -33430,7 +33430,7 @@ #: SupplierCredit.php:289 msgid "Credit Note Date" -msgstr "Fecha Abono" +msgstr "Fecha de nota de crédito" #: SupplierCredit.php:289 SupplierInvoice.php:634 msgid "in format" @@ -33501,7 +33501,7 @@ #: SupplierCredit.php:594 msgid "Credit Note Total" -msgstr "Total Abono" +msgstr "Total de nota de crédito" #: SupplierCredit.php:609 msgid "Enter Credit Note" @@ -33682,7 +33682,7 @@ #: SupplierCredit.php:1085 msgid "Credit note" -msgstr "Nota de Crédito (Abono)" +msgstr "Nota de crédito" #: SupplierCredit.php:1088 SupplierInvoice.php:1442 msgid "The general ledger transaction for the tax could not be added because" @@ -34513,7 +34513,7 @@ #: Suppliers.php:745 Suppliers.php:989 msgid "email format such as xx...@ma..." -msgstr "" +msgstr "formato de correo-e como xx...@ma..." #: Suppliers.php:749 msgid "Only URL address are allowed" @@ -40368,7 +40368,7 @@ #: Z_CheckDebtorsControl.php:41 msgid "End Period:" -msgstr "Período" +msgstr "Período final" #: Z_CheckDebtorsControl.php:72 msgid "Bal B/F in GL" @@ -40727,7 +40727,7 @@ #: Z_DeleteCreditNote.php:149 msgid "Credit note number" -msgstr "Abono número" +msgstr "Número de nota de crédito" #: Z_DeleteCreditNote.php:149 msgid "has been completely deleted" @@ -46488,7 +46488,7 @@ #: includes/PDFTransPageHeader.inc:20 msgid "CREDIT NOTE" -msgstr "NOTA DE CRÉDITO (ABONO)" +msgstr "NOTA DE CRÉDITO" #: includes/PDFTransPageHeader.inc:61 #: includes/PDFTransPageHeaderPortrait.inc:74 @@ -48420,7 +48420,7 @@ #: api/api_xml-rpc.php:1119 msgid "Credit note line items" -msgstr "Artículod de nota de Crédito" +msgstr "Artículos de nota de crédito" #: api/api_xml-rpc.php:1120 msgid "" |
From: <aga...@us...> - 2015-02-17 13:54:30
|
Revision: 7153 http://sourceforge.net/p/web-erp/reponame/7153 Author: agaluski Date: 2015-02-17 13:54:22 +0000 (Tue, 17 Feb 2015) Log Message: ----------- Add supplier name ot screen output and made sure screen output didn't lose title and menu Modified Paths: -------------- trunk/OutstandingGRNs.php Modified: trunk/OutstandingGRNs.php =================================================================== --- trunk/OutstandingGRNs.php 2015-02-15 02:52:57 UTC (rev 7152) +++ trunk/OutstandingGRNs.php 2015-02-17 13:54:22 UTC (rev 7153) @@ -164,7 +164,7 @@ $pdf->OutputD($_SESSION['DatabaseName'] . '_OSGRNsValuation_' . date('Y-m-d').'.pdf'); $pdf->__destruct(); } elseif (isset($_POST['ShowOnScreen']) AND DB_num_rows($GRNsResult)>0) { - + $Title=_('Outstanding GRNs Report'); include('includes/header.inc'); echo '<p class="page_title_text" align="center"><strong>' . _('Goods Received but not invoiced Yet') . '</strong></p>'; @@ -175,6 +175,7 @@ echo '<table class="selection">'; $TableHeader = '<tr> <th>' . _('Supplier') . '</th> + <th>' . _('Supplier Name') . '</th> <th>' . _('PO#') . '</th> <th>' . _('Item Code') . '</th> <th>' . _('Qty Received') . '</th> @@ -202,6 +203,7 @@ $QtyPending = $GRNs['qtyrecd'] - $GRNs['quantityinv']; $TotalHomeCurrency = $TotalHomeCurrency + ($QtyPending * $GRNs['stdcostunit']); printf('<td>%s</td> + <td>%s</td> <td class="number">%s</td> <td>%s</td> <td class="number">%s</td> @@ -215,6 +217,7 @@ <td>%s</td> </tr>', $GRNs['supplierid'], + $GRNs['suppname'], $GRNs['orderno'], $GRNs['itemcode'], $GRNs['qtyrecd'], |
From: <ex...@us...> - 2015-02-15 02:53:04
|
Revision: 7152 http://sourceforge.net/p/web-erp/reponame/7152 Author: exsonqu Date: 2015-02-15 02:52:57 +0000 (Sun, 15 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-15 02:50:35 UTC (rev 7151) +++ trunk/doc/Change.log 2015-02-15 02:52:57 UTC (rev 7152) @@ -1,5 +1,6 @@ webERP Change Log +15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. 12/2/15 RChacon: Fix on PrintCustTransPortrait.php: Do not need to escape special characters in a string for use in an SQL statement. 11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations 10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range |
From: <ex...@us...> - 2015-02-15 02:50:38
|
Revision: 7151 http://sourceforge.net/p/web-erp/reponame/7151 Author: exsonqu Date: 2015-02-15 02:50:35 +0000 (Sun, 15 Feb 2015) Log Message: ----------- 15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. Modified Paths: -------------- trunk/WorkOrderEntry.php Modified: trunk/WorkOrderEntry.php =================================================================== --- trunk/WorkOrderEntry.php 2015-02-12 02:22:56 UTC (rev 7150) +++ trunk/WorkOrderEntry.php 2015-02-15 02:50:35 UTC (rev 7151) @@ -22,13 +22,13 @@ if (isset($_GET['ReqDate'])){ $ReqDate = $_GET['ReqDate']; } else { - $ReqDate=Date($_SESSION['DefaultDateFormat']); + $ReqDate=Date('Y-m-d'); } if (isset($_GET['StartDate'])){ $StartDate = $_GET['StartDate']; } else { - $StartDate=Date($_SESSION['DefaultDateFormat']); + $StartDate=Date('Y-m-d'); } if (isset($_GET['loccode'])){ |
From: <rc...@us...> - 2015-02-12 02:22:58
|
Revision: 7150 http://sourceforge.net/p/web-erp/reponame/7150 Author: rchacon Date: 2015-02-12 02:22:56 +0000 (Thu, 12 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/doc/Change.log Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-12 02:19:30 UTC (rev 7149) +++ trunk/doc/Change.log 2015-02-12 02:22:56 UTC (rev 7150) @@ -1,5 +1,6 @@ webERP Change Log +12/2/15 RChacon: Fix on PrintCustTransPortrait.php: Do not need to escape special characters in a string for use in an SQL statement. 11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations 10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. |
From: <rc...@us...> - 2015-02-12 02:19:37
|
Revision: 7149 http://sourceforge.net/p/web-erp/reponame/7149 Author: rchacon Date: 2015-02-12 02:19:30 +0000 (Thu, 12 Feb 2015) Log Message: ----------- Fix. Do not need to escape special characters in a string for use in an SQL statement. Modified Paths: -------------- trunk/PrintCustTransPortrait.php Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2015-02-11 14:15:50 UTC (rev 7148) +++ trunk/PrintCustTransPortrait.php 2015-02-12 02:19:30 UTC (rev 7149) @@ -465,7 +465,7 @@ $pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']); $FontSize =8; - $LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext'])); + $LeftOvers=explode("\r\n",$myrow['invtext']); for ($i=0;$i<sizeOf($LeftOvers);$i++) { $pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]); } |
From: <vv...@us...> - 2015-02-11 14:15:57
|
Revision: 7148 http://sourceforge.net/p/web-erp/reponame/7148 Author: vvs2012 Date: 2015-02-11 14:15:50 +0000 (Wed, 11 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/BOMIndented.php Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2015-02-11 07:12:39 UTC (rev 7147) +++ trunk/BOMIndented.php 2015-02-11 14:15:50 UTC (rev 7148) @@ -108,12 +108,11 @@ bom.effectiveafter, bom.effectiveto, bom.quantity - FROM bom + FROM bom INNER JOIN passbom ON bom.parent = passbom.part INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveto > '" . date('Y-m-d') . "'"; + WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveto > '" . date('Y-m-d') . "'"; $result = DB_query($sql); $sql = "DROP TABLE IF EXISTS passbom2"; |
From: <dai...@us...> - 2015-02-11 07:12:47
|
Revision: 7147 http://sourceforge.net/p/web-erp/reponame/7147 Author: daintree Date: 2015-02-11 07:12:39 +0000 (Wed, 11 Feb 2015) Log Message: ----------- Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations Modified Paths: -------------- trunk/BOMIndented.php trunk/doc/Change.log Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2015-02-10 05:02:22 UTC (rev 7146) +++ trunk/BOMIndented.php 2015-02-11 07:12:39 UTC (rev 7147) @@ -108,11 +108,12 @@ bom.effectiveafter, bom.effectiveto, bom.quantity - FROM bom, passbom - INNER JOIN locationusers ON locationusers.loccode=loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE bom.parent = passbom.part - AND bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveto > '" . date('Y-m-d') . "'"; + FROM bom + INNER JOIN passbom ON bom.parent = passbom.part + INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveto > '" . date('Y-m-d') . "'"; $result = DB_query($sql); $sql = "DROP TABLE IF EXISTS passbom2"; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-10 05:02:22 UTC (rev 7146) +++ trunk/doc/Change.log 2015-02-11 07:12:39 UTC (rev 7147) @@ -1,5 +1,6 @@ webERP Change Log +11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations 10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. |
From: <dai...@us...> - 2015-02-10 05:02:24
|
Revision: 7146 http://sourceforge.net/p/web-erp/reponame/7146 Author: daintree Date: 2015-02-10 05:02:22 +0000 (Tue, 10 Feb 2015) Log Message: ----------- New Stock Category Sales Inquiry Modified Paths: -------------- trunk/doc/Change.log Added Paths: ----------- trunk/StockCategorySalesInquiry.php Added: trunk/StockCategorySalesInquiry.php =================================================================== --- trunk/StockCategorySalesInquiry.php (rev 0) +++ trunk/StockCategorySalesInquiry.php 2015-02-10 05:02:22 UTC (rev 7146) @@ -0,0 +1,237 @@ +<?php + +/* $Id: StockCategorySalesInquiry.php 4261 2010-12-22 15:56:50Z $*/ + +include('includes/session.inc'); +$Title = _('Sales By Category By Item Inquiry'); +include('includes/header.inc'); + +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales By Category By Item Inquiry') . '</p>'; +echo '<div class="page_help_text">' . _('Select the parameters for the inquiry') . '</div><br />'; + +if (!isset($_POST['DateRange'])){ + /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/ + $_POST['DateRange']='ThisMonth'; +} + +echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; +echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; +// stock category selection + $SQL="SELECT categoryid, + categorydescription + FROM stockcategory + ORDER BY categorydescription"; + $result1 = DB_query($SQL); + +echo '<table cellpadding="2" class="selection"> + <tr> + <td style="width:150px">' . _('In Stock Category') . ':</td> + <td><select name="StockCat">'; +if (!isset($_POST['StockCat'])){ + $_POST['StockCat']='All'; +} +if ($_POST['StockCat']=='All'){ + echo '<option selected="selected" value="All">' . _('All') . '</option>'; +} else { + echo '<option value="All">' . _('All') . '</option>'; +} +while ($myrow1 = DB_fetch_array($result1)) { + if ($myrow1['categoryid']==$_POST['StockCat']){ + echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + } else { + echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + } +} +echo '</select></td> + </tr> + <tr> + <th colspan="2" class="centre">' . _('Date Selection') . '</th> + </tr>'; + +if (!isset($_POST['FromDate'])){ + unset($_POST['ShowSales']); + $_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(1,1,1,Date('m')-12,Date('d')+1,Date('Y'))); + $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); +} +echo '<tr> + <td>' . _('Date From') . ':</td> + <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td> + </tr>'; +echo '<tr> + <td>' . _('Date To') . ':</td> + <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td> + </tr> +</table> +<br /> +<div class="centre"> + <input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" /> +</div> +</div> +</form> +<br />'; + + +if (isset($_POST['ShowSales'])){ + $InputError=0; //assume no input errors now test for errors + if (!Is_Date($_POST['FromDate'])){ + $InputError = 1; + prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error'); + } + if (!Is_Date($_POST['ToDate'])){ + $InputError = 1; + prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error'); + } + if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){ + $InputError = 1; + prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error'); + } + $FromDate = FormatDateForSQL($_POST['FromDate']); + $ToDate = FormatDateForSQL($_POST['ToDate']); + + $sql = "SELECT stockmaster.categoryid, + stockcategory.categorydescription, + stockmaster.stockid, + stockmaster.description, + SUM(price*(1-discountpercent)* -qty) as salesvalue, + SUM(-qty) as quantitysold, + SUM(standardcost * -qty) as cogs + FROM stockmoves INNER JOIN stockmaster + ON stockmoves.stockid=stockmaster.stockid + INNER JOIN stockcategory + ON stockmaster.categoryid=stockcategory.categoryid + WHERE (stockmoves.type=10 OR stockmoves.type=11) + AND show_on_inv_crds =1 + AND trandate>='" . $FromDate . "' + AND trandate<='" . $ToDate . "' + GROUP BY stockmaster.categoryid, + stockcategory.categorydescription, + stockmaster.stockid, + stockmaster.description + ORDER BY stockmaster.categoryid, + salesvalue DESC"; + + $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg(); + $SalesResult = DB_query($sql,$ErrMsg); + + echo '<table cellpadding="2" class="selection">'; + + echo'<tr> + <th>' . _('Item Code') . '</th> + <th>' . _('Item Description') . '</th> + <th>' . _('Qty Sold') . '</td> + <th>' . _('Sales Revenue') . '</th> + <th>' . _('COGS') . '</th> + <th>' . _('Gross Margin') . '</th> + <th>' . _('Avg Unit') . '<br/>' . _('Sale Price') . '</th> + <th>' . _('Avg Unit') . '<br/>' . _('Cost') . '</th> + <th>' . _('Margin %') . '</th> + </tr>'; + + $CumulativeTotalSales = 0; + $CumulativeTotalQty = 0; + $CumulativeTotalCOGS = 0; + $CategorySales = 0; + $CategoryQty = 0; + $CategoryCOGS = 0; + + $k=0; + $CategoryID =''; + while ($SalesRow=DB_fetch_array($SalesResult)) { + if ($CategoryID != $SalesRow['categoryid']) { + if ($CategoryID !='') { + //print out the previous category totals + echo '<tr> + <td colspan="2" class="number">' . _('Category Total') . '</td> + <td class="number">' . locale_number_format($CategoryQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales - $CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<td class="number">' . locale_number_format(($CategorySales-$CategoryCOGS)*100/$CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr>'; + + //reset the totals + $CategorySales = 0; + $CategoryQty = 0; + $CategoryCOGS = 0; + + } + echo '<tr> + <th colspan="9">' . _('Stock Category') . ': ' . $SalesRow['categoryid'] . ' - ' . $SalesRow['categorydescription'] . '</th> + </tr>'; + $CategoryID = $SalesRow['categoryid']; + } + + if ($k==1){ + echo '<tr class="EvenTableRows">'; + $k=0; + } else { + echo '<tr class="OddTableRows">'; + $k=1; + } + + echo '<td>' . $SalesRow['stockid'] . '</td> + <td>' . $SalesRow['description'] . '</td> + <td class="number">' . locale_number_format($SalesRow['quantitysold'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['salesvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['cogs'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['salesvalue']-$SalesRow['cogs'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + if ($SalesRow['quantitysold']!=0) { + echo '<td class="number">' . locale_number_format(($SalesRow['salesvalue']/$SalesRow['quantitysold']),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + echo '<td class="number">' . locale_number_format(($SalesRow['cogs']/$SalesRow['quantitysold']),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + } else { + echo '<td>' . _('N/A') . '</td> + <td>' . _('N/A') . '</td>'; + } + if ($SalesRow['salesvalue']!=0) { + echo '<td class="number">' . locale_number_format((($SalesRow['salesvalue']-$SalesRow['cogs'])*100/$SalesRow['salesvalue']),$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr>'; + + $CumulativeTotalSales += $SalesRow['salesvalue']; + $CumulativeTotalCOGS += $SalesRow['cogs']; + $CumulativeTotalQty += $SalesRow['quantitysold']; + $CategorySales += $SalesRow['salesvalue']; + $CategoryQty += $SalesRow['quantitysold']; + $CategoryCOGS += $SalesRow['cogs']; + + } //loop around category sales for the period +//print out the previous category totals + echo '<tr> + <td colspan="2" class="number">' . _('Category Total') . '</td> + <td class="number">' . locale_number_format($CategoryQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales - $CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<td class="number">' . locale_number_format(($CategorySales-$CategoryCOGS)*100/$CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr> + <tr> + <th colspan="2" class="number">' . _('GRAND Total') . '</th> + <th class="number">' . locale_number_format($CumulativeTotalQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalSales - $CumulativeTotalCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<th class="number">' . locale_number_format(($CumulativeTotalSales-$CumulativeTotalCOGS)*100/$CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</th>'; + } else { + echo '<th>' . _('N/A') . '</th>'; + } + echo '</tr> + </table>'; + +} //end of if user hit show sales +include('includes/footer.inc'); +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-10 04:55:43 UTC (rev 7145) +++ trunk/doc/Change.log 2015-02-10 05:02:22 UTC (rev 7146) @@ -1,5 +1,6 @@ webERP Change Log +10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. |
From: <dai...@us...> - 2015-02-10 04:55:47
|
Revision: 7145 http://sourceforge.net/p/web-erp/reponame/7145 Author: daintree Date: 2015-02-10 04:55:43 +0000 (Tue, 10 Feb 2015) Log Message: ----------- Reinstate Andews custitems search option in searching for items in order entry Modified Paths: -------------- trunk/SelectOrderItems.php trunk/doc/Change.log trunk/includes/MainMenuLinksArray.php trunk/sql/mysql/upgrade4.12-4.13.sql Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/SelectOrderItems.php 2015-02-10 04:55:43 UTC (rev 7145) @@ -707,10 +707,10 @@ } if(!empty($_POST['CustItemFlag'])){ $IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid - AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; - }else{ + AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "' "; + } else { $IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid - AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; + AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "' "; } if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') { @@ -721,14 +721,18 @@ $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; } $SQL = "SELECT stockmaster.stockid, - stockmaster.description, - stockmaster.longdescription, - stockmaster.units - FROM stockmaster INNER JOIN stockcategory - ON stockmaster.categoryid=stockcategory.categoryid - WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L') - AND stockmaster.mbflag <>'G' - AND stockmaster.discontinued=0 "; + stockmaster.description, + stockmaster.longdescription, + stockmaster.units, + custitem.cust_part, + custitem.cust_description + FROM stockmaster INNER JOIN stockcategory + ON stockmaster.categoryid=stockcategory.categoryid + " . $IncludeCustItem . " + WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L') + AND stockmaster.mbflag <>'G' + AND stockmaster.discontinued=0 "; + if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/doc/Change.log 2015-02-10 04:55:43 UTC (rev 7145) @@ -1,10 +1,11 @@ webERP Change Log +10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. -8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV +8/2/15 Phil: InventoryPlanning.php now has an option to export the last 24 months usage to CSV 8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. -7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php +7/2/15 Phil: New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/includes/MainMenuLinksArray.php 2015-02-10 04:55:43 UTC (rev 7145) @@ -56,6 +56,7 @@ _('Daily Sales Inquiry'), _('Sales By Sales Type Inquiry'), _('Sales By Category Inquiry'), + _('Sales By Category By Item Inquiry'), _('Top Sellers Inquiry'), _('Order Delivery Differences Report'), _('Delivery In Full On Time (DIFOT) Report'), @@ -73,6 +74,7 @@ '/DailySalesInquiry.php', '/SalesByTypePeriodInquiry.php', '/SalesCategoryPeriodInquiry.php', + '/StockCategorySalesInquiry.php', '/SalesTopItemsInquiry.php', '/PDFDeliveryDifferences.php', '/PDFDIFOT.php', Modified: trunk/sql/mysql/upgrade4.12-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-10 04:55:43 UTC (rev 7145) @@ -1,3 +1,3 @@ INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF'); - +INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items'); -----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; \ No newline at end of file |
From: <rc...@us...> - 2015-02-09 23:07:24
|
Revision: 7144 http://sourceforge.net/p/web-erp/reponame/7144 Author: rchacon Date: 2015-02-09 23:07:16 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Upload preview.png to professional-rtl and Spanish update. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Added Paths: ----------- trunk/css/professional-rtl/images/preview.png Added: trunk/css/professional-rtl/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/preview.png =================================================================== --- trunk/css/professional-rtl/images/preview.png 2015-02-09 00:07:40 UTC (rev 7143) +++ trunk/css/professional-rtl/images/preview.png 2015-02-09 23:07:16 UTC (rev 7144) Property changes on: trunk/css/professional-rtl/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-09 00:07:40 UTC (rev 7143) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-09 23:07:16 UTC (rev 7144) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-06 19:17+1300\n" -"PO-Revision-Date: 2015-02-06 12:45-0600\n" +"PO-Revision-Date: 2015-02-09 17:02-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -7554,7 +7554,7 @@ #: Credit_Invoice.php:1614 msgid "Credit note text" -msgstr "Texto de la nota de crédito" +msgstr "Texto de nota de crédito" #: Credit_Invoice.php:1626 msgid "Process Credit" @@ -15699,7 +15699,7 @@ #: index.php:23 msgid "Create a new offer" -msgstr "Crear una Nueva Oferta" +msgstr "Crear una nueva oferta" #: index.php:28 msgid "View any open tenders without an offer" @@ -17471,7 +17471,7 @@ #: MRPCalendar.php:302 msgid "Create Calendar" -msgstr "Crear Calendario" +msgstr "Crear calendario" #: MRPCalendar.php:303 msgid "List Date Range" @@ -27327,7 +27327,7 @@ #: SelectCreditItems.php:944 msgid "Credit Note Text" -msgstr "" +msgstr "Texto de nota de crédito" #: SelectCreditItems.php:957 msgid "Are you sure you wish to cancel the whole of this credit note?" @@ -31263,7 +31263,7 @@ #: StockDispatch.php:423 msgid "Create Batch" -msgstr "Crear Lote" +msgstr "Crear lote" #: StockDispatch.php:424 msgid "Report Only" @@ -41069,7 +41069,7 @@ #: Z_ExportSalesAnalysis.php:17 msgid "Create and send sales analysis files" -msgstr "" +msgstr "Crear y enviar archivos de análisis de ventas" #: Z_ExportSalesAnalysis.php:20 msgid "Export Sales Analysis Files" @@ -45004,7 +45004,7 @@ #: includes/MainMenuLinksArray.php:95 msgid "Create A Credit Note" -msgstr "Crear una nota de Crédito (Abono)" +msgstr "Crear una nota de crédito (Abono)" #: includes/MainMenuLinksArray.php:97 msgid "Allocate Receipts or Credit Notes" |
From: <rc...@us...> - 2015-02-09 00:07:48
|
Revision: 7143 http://sourceforge.net/p/web-erp/reponame/7143 Author: rchacon Date: 2015-02-09 00:07:40 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Standardise to currency.png. Delete currency.gif. Modified Paths: -------------- trunk/Currencies.php trunk/ExchangeRateTrend.php trunk/css/professional-rtl/images/credit.png trunk/doc/Change.log Removed Paths: ------------- trunk/css/default/images/currency.gif trunk/css/fluid/images/currency.gif trunk/css/fresh/images/currency.gif trunk/css/professional/images/currency.gif trunk/css/xenos/images/currency.gif Modified: trunk/Currencies.php =================================================================== --- trunk/Currencies.php 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/Currencies.php 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,12 +1,13 @@ <?php - /* $Id$*/ +/* This script defines the currencies available. Each customer and supplier must be defined as transacting in one of the currencies defined here. */ include('includes/session.inc'); -$Title = _('Currencies Maintenance'); -$ViewTopic= 'Currencies'; -$BookMark = 'Currencies'; +$Title = _('Currencies Maintenance');// Screen identification. +$ViewTopic= 'Currencies';// Filename's id in ManualContents.php's TOC. +$BookMark = 'Currencies';// Anchor's id in the manual's html document. include('includes/header.inc'); + include('includes/CurrenciesArray.php'); // To get the currency name from the currency code. include('includes/SQL_CommonFunctions.inc'); @@ -27,8 +28,10 @@ $Errors = array(); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p> - <br />'; +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/currency.png" title="' .// Icon image. + _('Currencies') . '" /> ' .// Icon title. + _('Currencies Maintenance') . '</p>';// Page title. if (isset($_POST['submit'])) { Modified: trunk/ExchangeRateTrend.php =================================================================== --- trunk/ExchangeRateTrend.php 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/ExchangeRateTrend.php 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,9 +1,11 @@ <?php - /* $Id$*/ +/* This script shows the trend in exchange rates as retrieved from ECB. */ include('includes/session.inc'); -$Title = _('View Currency Trends'); +$Title = _('View Currency Trends');// Screen identification. +$ViewTopic= 'Currencies';// Filename's id in ManualContents.php's TOC. +$BookMark = 'ExchangeRateTrend';// Anchor's id in the manual's html document. include('includes/header.inc'); $FunctionalCurrency = $_SESSION['CompanyRecord']['currencydefault']; @@ -21,9 +23,12 @@ echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo '<div class="centre"><p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . - _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p></div>'; - echo '<table>'; // First column + echo '<div class="centre">'; + echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/currency.png" title="' .// Icon image. + _('View Currency Trend') . '" /> ' .// Icon title. + _('View Currency Trend') . '</p>';// Page title. + echo '</div><table>'; // First column $SQL = "SELECT currabrev FROM currencies"; $result=DB_query($SQL); @@ -73,4 +78,4 @@ </table>'; include('includes/footer.inc'); -?> \ No newline at end of file +?> Deleted: trunk/css/default/images/currency.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/currency.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/currency.gif =================================================================== --- trunk/css/fresh/images/currency.gif 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/css/fresh/images/currency.gif 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,6 +0,0 @@ -GIF89a -\x86\xA2\xA4\x860Hcs@Vlv\xA2\x95\xB1\x86h$\x8FLU>\x94\xB2 -DLDDY\x9F\x84 --\xD1\xC6Y\xD6_)\xEC\xDE\xCD?"W,\xF6\xFC\xDE\xB1\xED\xDA\xF1\xCBA\xB0 Apޘ<x\x80TA\ No newline at end of file Deleted: trunk/css/professional/images/currency.gif =================================================================== (Binary files differ) Modified: trunk/css/professional-rtl/images/credit.png =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/currency.gif =================================================================== (Binary files differ) Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/doc/Change.log 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,5 +1,6 @@ webERP Change Log +9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. 8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV 8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. |
From: <rc...@us...> - 2015-02-08 23:29:13
|
Revision: 7142 http://sourceforge.net/p/web-erp/reponame/7142 Author: rchacon Date: 2015-02-08 23:29:03 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Fix to 32x32. Modified Paths: -------------- trunk/css/aguapop/images/folders.png trunk/css/wood/images/folders.png trunk/css/xenos/images/folders.png Modified: trunk/css/aguapop/images/folders.png =================================================================== (Binary files differ) Modified: trunk/css/wood/images/folders.png =================================================================== (Binary files differ) Modified: trunk/css/xenos/images/folders.png =================================================================== (Binary files differ) |
From: <vv...@us...> - 2015-02-08 18:43:34
|
Revision: 7141 http://sourceforge.net/p/web-erp/reponame/7141 Author: vvs2012 Date: 2015-02-08 18:43:27 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/css/professional/images/credit.png Modified: trunk/css/professional/images/credit.png =================================================================== (Binary files differ) |
From: <vv...@us...> - 2015-02-08 18:36:33
|
Revision: 7140 http://sourceforge.net/p/web-erp/reponame/7140 Author: vvs2012 Date: 2015-02-08 18:36:24 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Added Paths: ----------- trunk/css/professional/images/preview.png Added: trunk/css/professional/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/preview.png =================================================================== --- trunk/css/professional/images/preview.png 2015-02-08 04:08:13 UTC (rev 7139) +++ trunk/css/professional/images/preview.png 2015-02-08 18:36:24 UTC (rev 7140) Property changes on: trunk/css/professional/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <rc...@us...> - 2015-02-08 04:08:16
|
Revision: 7139 http://sourceforge.net/p/web-erp/reponame/7139 Author: rchacon Date: 2015-02-08 04:08:13 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Changes from email.gif to email.png. Delete email.gif. Modified Paths: -------------- trunk/CustomerAccount.php trunk/SMTPServer.php trunk/doc/Change.log Removed Paths: ------------- trunk/css/aguapop/images/email.gif trunk/css/default/images/email.gif trunk/css/fluid/images/email.gif trunk/css/fresh/images/email.gif trunk/css/gel/images/email.gif trunk/css/professional/images/email.gif trunk/css/professional-rtl/images/email.gif trunk/css/silverwolf/images/email.gif trunk/css/wood/images/email.gif trunk/css/xenos/images/email.gif Modified: trunk/CustomerAccount.php =================================================================== --- trunk/CustomerAccount.php 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/CustomerAccount.php 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,11 +1,11 @@ <?php /* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/ +/* This script is <create a description for script table>. */ include('includes/session.inc'); -$Title = _('Customer Account'); -/* Manual links before header.inc */ -$ViewTopic = 'ARInquiries'; // Filename in ManualContents.php's TOC. -$BookMark = 'CustomerAccount'; // Anchor's id in the manual's html document. +$Title = _('Customer Account');// Screen identification. +$ViewTopic = 'ARInquiries';// Filename in ManualContents.php's TOC. +$BookMark = 'CustomerAccount';// Anchor's id in the manual's html document. include('includes/header.inc'); // always figure out the SQL required from the inputs available @@ -313,7 +313,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -343,7 +343,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> Modified: trunk/SMTPServer.php =================================================================== --- trunk/SMTPServer.php 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/SMTPServer.php 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,12 +1,16 @@ <?php /* $Id: SMTPServer.php 4469 2011-01-15 02:28:37Z daintree $*/ +/* This script is <create a description for script table>. */ + include('includes/session.inc'); - -$Title = _('SMTP Server details'); - +$Title = _('SMTP Server details');// Screen identification. +$ViewTopic = 'CreatingNewSystem';// Filename's id in ManualContents.php's TOC. +$BookMark = 'SMTPServer';// Anchor's id in the manual's html document. include('includes/header.inc'); - -echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/email.gif" title="' . _('SMTP Server') . '" alt="" />' . ' ' . _('SMTP Server Settings') . '</p>'; +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/email.png" title="' .// Icon image. + _('SMTP Server') . '" /> ' .// Icon title. + _('SMTP Server Settings') . '</p>';// Page title. // First check if there are smtp server data or not @@ -18,7 +22,7 @@ username='".$_POST['UserName']."', password='".$_POST['Password']."', auth='".$_POST['Auth']."'"; - + $ErrMsg = _('The email setting information failed to update'); $DbgMsg = _('The SQL failed to update is '); $result1=DB_query($sql, $ErrMsg, $DbgMsg); Deleted: trunk/css/aguapop/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/default/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/gel/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional-rtl/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/silverwolf/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/wood/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/email.gif =================================================================== (Binary files differ) Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/doc/Change.log 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,6 +1,8 @@ webERP Change Log +8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. 8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV +8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. 7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 |
From: <dai...@us...> - 2015-02-08 02:17:22
|
Revision: 7138 http://sourceforge.net/p/web-erp/reponame/7138 Author: daintree Date: 2015-02-08 02:17:15 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Change references to email.gif to email.png now Rafael deleted email.gif Modified Paths: -------------- trunk/CustomerInquiry.php Modified: trunk/CustomerInquiry.php =================================================================== --- trunk/CustomerInquiry.php 2015-02-08 02:15:28 UTC (rev 7137) +++ trunk/CustomerInquiry.php 2015-02-08 02:17:15 UTC (rev 7138) @@ -317,7 +317,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email '), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td> @@ -359,7 +359,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -396,7 +396,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -430,7 +430,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> @@ -472,7 +472,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> |
From: <dai...@us...> - 2015-02-08 02:15:35
|
Revision: 7137 http://sourceforge.net/p/web-erp/reponame/7137 Author: daintree Date: 2015-02-08 02:15:28 +0000 (Sun, 08 Feb 2015) Log Message: ----------- New option to export 24 months sales net of credits to CSV Modified Paths: -------------- trunk/InventoryPlanning.php trunk/doc/Change.log trunk/includes/DateFunctions.inc Modified: trunk/InventoryPlanning.php =================================================================== --- trunk/InventoryPlanning.php 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/InventoryPlanning.php 2015-02-08 02:15:28 UTC (rev 7137) @@ -345,6 +345,111 @@ $pdf-> __destruct(); } +} elseif (isset($_POST['ExportToCSV'])){ //send the data to a CSV + + function stripcomma($str) { //because we're using comma as a delimiter + return str_replace(',', '', str_replace(';','', $str)); + } + /*Now figure out the inventory data to report for the category range under review + need QOH, QOO, QDem, Sales Mth -1, Sales Mth -2, Sales Mth -3, Sales Mth -4*/ + if ($_POST['Location']=='All'){ + $SQL = "SELECT stockmaster.categoryid, + stockmaster.description, + stockcategory.categorydescription, + locstock.stockid, + SUM(locstock.quantity) AS qoh + FROM locstock + INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + stockmaster, + stockcategory + WHERE locstock.stockid=stockmaster.stockid + AND stockmaster.discontinued = 0 + AND stockmaster.categoryid=stockcategory.categoryid + AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') + AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."') + GROUP BY stockmaster.categoryid, + stockmaster.description, + stockcategory.categorydescription, + locstock.stockid, + stockmaster.stockid + ORDER BY stockmaster.categoryid, + stockmaster.stockid"; + } else { + $SQL = "SELECT stockmaster.categoryid, + locstock.stockid, + stockmaster.description, + stockcategory.categorydescription, + locstock.quantity AS qoh + FROM locstock + INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + stockmaster, + stockcategory + WHERE locstock.stockid=stockmaster.stockid + AND stockmaster.discontinued = 0 + AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."') + AND stockmaster.categoryid=stockcategory.categoryid + AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') + AND locstock.loccode = '" . $_POST['Location'] . "' + ORDER BY stockmaster.categoryid, + stockmaster.stockid"; + } + $InventoryResult = DB_query($SQL); + $CurrentPeriod = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db); + $Periods = array(); + for ($i=0;$i<24;$i++) { + $Periods[$i]['Period'] = $CurrentPeriod - $i; + $Periods[$i]['Month'] = GetMonthText(Date('m',mktime(0,0,0,Date('m') - $i,Date('d'),Date('Y')))) . ' ' . Date('Y',mktime(0,0,0,Date('m') - $i,Date('d'),Date('Y'))); + } + $SQLStarter = "SELECT stockmoves.stockid,"; + for ($i=0;$i<24;$i++) { + $SQLStarter .= "SUM(CASE WHEN prd='" . $Periods[$i]['Period'] . "' THEN -qty ELSE 0 END) AS prd" . $i . ' '; + if ($i<23) { + $SQLStarter .= ', '; + } + } + $SQLStarter .= "FROM stockmoves + INNER JOIN locationusers ON locationusers.loccode=stockmoves.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE (type=10 OR type=11) + AND stockmoves.hidemovt=0"; + if ($_POST['Location']!='All'){ + $SQLStarter .= " AND stockmoves.loccode ='" . $_POST['Location'] . "'"; + } + + + $CSVListing = _('Category ID') .','. _('Category Description') .','. _('Stock ID') .','. _('Description') .',' . _('QOH') . ','; + for ($i=0;$i<24;$i++) { + $CSVListing .= $Periods[$i]['Month'] . ','; + } + $CSVListing .= "\r\n"; + + $Category =''; + + while ($InventoryPlan = DB_fetch_array($InventoryResult)){ + + $SQL = $SQLStarter . " AND stockid='" . $InventoryPlan['stockid'] . "' GROUP BY stockmoves.stockid"; + $SalesResult = DB_query($SQL,_('The stock usage of this item could not be retrieved because')); + + if (DB_num_rows($SalesResult)==0) { + $CSVListing .= stripcomma($InventoryPlan['categoryid']) . ',' . stripcomma($InventoryPlan['categorydescription']) . ',' .stripcomma($InventoryPlan['stockid']) . ',' . stripcomma($InventoryPlan['description']) . ',' . stripcomma($InventoryPlan['qoh']) . "\r\n"; + } else { + $SalesRow = DB_fetch_array($SalesResult); + $CSVListing .= stripcomma($InventoryPlan['categoryid']) . ',' . stripcomma($InventoryPlan['categorydescription']) . ',' .stripcomma($InventoryPlan['stockid']) . ',' . stripcomma($InventoryPlan['description']) . ',' . stripcomma($InventoryPlan['qoh']); + for ($i=0;$i<24;$i++) { + $CSVListing .= ',' . $SalesRow['prd' .$i]; + } + $CSVListing .= "\r\n"; + } + + } + header('Content-Encoding: UTF-8'); + header('Content-type: text/csv; charset=UTF-8'); + header("Content-disposition: attachment; filename=InventoryPlanning_" . Date('Y-m-d:h:m:s') .'.csv'); + header("Pragma: public"); + header("Expires: 0"); + echo "\xEF\xBB\xBF"; // UTF-8 + echo $CSVListing; + exit; + } else { /*The option to print PDF was not hit */ $Title=_('Inventory Planning Reporting'); @@ -361,8 +466,8 @@ <tr> <td>' . _('Select Inventory Categories') . ':</td> <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">'; - $SQL = 'SELECT categoryid, categorydescription - FROM stockcategory + $SQL = 'SELECT categoryid, categorydescription + FROM stockcategory ORDER BY categorydescription'; $CatResult = DB_query($SQL); while ($MyRow = DB_fetch_array($CatResult)) { @@ -375,7 +480,7 @@ echo '</select> </td> </tr>'; - + echo '<tr> <td>' . _('For Inventory in Location') . ':</td> <td><select name="Location">'; @@ -414,6 +519,7 @@ <br /> <div class="centre"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /> + <input type="submit" name="ExportToCSV" value="' . _('Export 24 months to CSV') . '" /> </div> </div> </form>'; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/doc/Change.log 2015-02-08 02:15:28 UTC (rev 7137) @@ -1,5 +1,6 @@ webERP Change Log +8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV 7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 Modified: trunk/includes/DateFunctions.inc =================================================================== --- trunk/includes/DateFunctions.inc 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/includes/DateFunctions.inc 2015-02-08 02:15:28 UTC (rev 7137) @@ -139,6 +139,9 @@ case 12: $Month = _('December'); break; + default: + $Month = _('error'); + break; } return $Month; } |
From: <rc...@us...> - 2015-02-07 21:51:00
|
Revision: 7136 http://sourceforge.net/p/web-erp/reponame/7136 Author: rchacon Date: 2015-02-07 21:50:57 +0000 (Sat, 07 Feb 2015) Log Message: ----------- Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. Added Paths: ----------- trunk/css/aguapop/images/credit.png trunk/css/aguapop/images/email.png trunk/css/aguapop/images/folders.png trunk/css/default/images/credit.png trunk/css/default/images/currency.png trunk/css/default/images/email.png trunk/css/default/images/folders.png trunk/css/fluid/images/credit.png trunk/css/fluid/images/currency.png trunk/css/fluid/images/email.png trunk/css/fluid/images/folders.png trunk/css/fresh/images/credit.png trunk/css/fresh/images/currency.png trunk/css/fresh/images/email.png trunk/css/fresh/images/folders.png trunk/css/gel/images/credit.png trunk/css/gel/images/currency.png trunk/css/gel/images/email.png trunk/css/gel/images/folders.png trunk/css/professional/images/credit.png trunk/css/professional/images/currency.png trunk/css/professional/images/email.png trunk/css/professional/images/folders.png trunk/css/professional-rtl/images/credit.png trunk/css/professional-rtl/images/currency.png trunk/css/professional-rtl/images/email.png trunk/css/professional-rtl/images/folders.png trunk/css/silverwolf/images/credit.png trunk/css/silverwolf/images/currency.png trunk/css/silverwolf/images/email.png trunk/css/silverwolf/images/folders.png trunk/css/wood/images/credit.png trunk/css/wood/images/currency.png trunk/css/wood/images/email.png trunk/css/wood/images/folders.png trunk/css/xenos/images/credit.png trunk/css/xenos/images/currency.png trunk/css/xenos/images/email.png trunk/css/xenos/images/folders.png Removed Paths: ------------- trunk/css/default/images/bank.gif trunk/css/fluid/images/bank.gif trunk/css/fresh/images/bank.gif trunk/css/professional-rtl/images/bank.gif trunk/css/xenos/images/bank.gif Added: trunk/css/aguapop/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/aguapop/images/credit.png =================================================================== --- trunk/css/aguapop/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/aguapop/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/aguapop/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/aguapop/images/email.png =================================================================== (Binary files differ) Index: trunk/css/aguapop/images/email.png =================================================================== --- trunk/css/aguapop/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/aguapop/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/aguapop/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/aguapop/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/aguapop/images/folders.png =================================================================== --- trunk/css/aguapop/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/aguapop/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/aguapop/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: trunk/css/default/images/bank.gif =================================================================== (Binary files differ) Added: trunk/css/default/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/default/images/credit.png =================================================================== --- trunk/css/default/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/default/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/default/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/default/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/default/images/currency.png =================================================================== --- trunk/css/default/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/default/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/default/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/default/images/email.png =================================================================== (Binary files differ) Index: trunk/css/default/images/email.png =================================================================== --- trunk/css/default/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/default/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/default/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/default/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/default/images/folders.png =================================================================== --- trunk/css/default/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/default/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/default/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: trunk/css/fluid/images/bank.gif =================================================================== (Binary files differ) Added: trunk/css/fluid/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/credit.png =================================================================== --- trunk/css/fluid/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fluid/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fluid/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/currency.png =================================================================== --- trunk/css/fluid/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fluid/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fluid/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/email.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/email.png =================================================================== --- trunk/css/fluid/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fluid/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fluid/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/folders.png =================================================================== --- trunk/css/fluid/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fluid/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fluid/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: trunk/css/fresh/images/bank.gif =================================================================== (Binary files differ) Added: trunk/css/fresh/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/credit.png =================================================================== --- trunk/css/fresh/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fresh/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fresh/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/currency.png =================================================================== --- trunk/css/fresh/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fresh/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fresh/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/email.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/email.png =================================================================== --- trunk/css/fresh/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fresh/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fresh/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/folders.png =================================================================== --- trunk/css/fresh/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/fresh/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/fresh/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/credit.png =================================================================== --- trunk/css/gel/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/gel/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/gel/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/currency.png =================================================================== --- trunk/css/gel/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/gel/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/gel/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/email.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/email.png =================================================================== --- trunk/css/gel/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/gel/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/gel/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/folders.png =================================================================== --- trunk/css/gel/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/gel/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/gel/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/credit.png =================================================================== --- trunk/css/professional/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/currency.png =================================================================== --- trunk/css/professional/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/email.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/email.png =================================================================== --- trunk/css/professional/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/folders.png =================================================================== --- trunk/css/professional/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: trunk/css/professional-rtl/images/bank.gif =================================================================== (Binary files differ) Added: trunk/css/professional-rtl/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/credit.png =================================================================== --- trunk/css/professional-rtl/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional-rtl/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional-rtl/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional-rtl/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/currency.png =================================================================== --- trunk/css/professional-rtl/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional-rtl/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional-rtl/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional-rtl/images/email.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/email.png =================================================================== --- trunk/css/professional-rtl/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional-rtl/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional-rtl/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional-rtl/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/folders.png =================================================================== --- trunk/css/professional-rtl/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/professional-rtl/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/professional-rtl/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/credit.png =================================================================== --- trunk/css/silverwolf/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/silverwolf/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/silverwolf/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/currency.png =================================================================== --- trunk/css/silverwolf/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/silverwolf/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/silverwolf/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/email.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/email.png =================================================================== --- trunk/css/silverwolf/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/silverwolf/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/silverwolf/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/folders.png =================================================================== --- trunk/css/silverwolf/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/silverwolf/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/silverwolf/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/credit.png =================================================================== --- trunk/css/wood/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/wood/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/wood/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/currency.png =================================================================== --- trunk/css/wood/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/wood/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/wood/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/email.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/email.png =================================================================== --- trunk/css/wood/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/wood/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/wood/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/folders.png =================================================================== --- trunk/css/wood/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/wood/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/wood/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: trunk/css/xenos/images/bank.gif =================================================================== (Binary files differ) Added: trunk/css/xenos/images/credit.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/credit.png =================================================================== --- trunk/css/xenos/images/credit.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/xenos/images/credit.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/xenos/images/credit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/currency.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/currency.png =================================================================== --- trunk/css/xenos/images/currency.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/xenos/images/currency.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/xenos/images/currency.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/email.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/email.png =================================================================== --- trunk/css/xenos/images/email.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/xenos/images/email.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/xenos/images/email.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/folders.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/folders.png =================================================================== --- trunk/css/xenos/images/folders.png 2015-02-07 21:32:31 UTC (rev 7135) +++ trunk/css/xenos/images/folders.png 2015-02-07 21:50:57 UTC (rev 7136) Property changes on: trunk/css/xenos/images/folders.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <dai...@us...> - 2015-02-07 21:32:33
|
Revision: 7135 http://sourceforge.net/p/web-erp/reponame/7135 Author: daintree Date: 2015-02-07 21:32:31 +0000 (Sat, 07 Feb 2015) Log Message: ----------- missing upgrade file added to repository Modified Paths: -------------- trunk/doc/Change.log Added Paths: ----------- trunk/sql/mysql/upgrade4.11.3-4.11.4.sql Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-07 03:24:43 UTC (rev 7134) +++ trunk/doc/Change.log 2015-02-07 21:32:31 UTC (rev 7135) @@ -1,5 +1,7 @@ webERP Change Log +7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php + 6/2/15 Version 4.12.2 6/2/15 Vitaly:Added SQL to add the script LocationUsers.php and the necessary table locationusers Added: trunk/sql/mysql/upgrade4.11.3-4.11.4.sql =================================================================== --- trunk/sql/mysql/upgrade4.11.3-4.11.4.sql (rev 0) +++ trunk/sql/mysql/upgrade4.11.3-4.11.4.sql 2015-02-07 21:32:31 UTC (rev 7135) @@ -0,0 +1,94 @@ +INSERT INTO `systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0'); +INSERT INTO config (confname, confvalue) VALUES ('AutoSupplierNo', '0'); +DELETE FROM config WHERE confname='DefaultTheme'; +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFWOPrint.php', '11', 'Produces W/O Paperwork'); +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFFGLabel.php', '11', 'Produces FG Labels'); +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFQALabel.php', '2', 'Produces a QA label on receipt of stock'); +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('CustItem.php', '11', 'Customer Items'); +ALTER TABLE `woitems` ADD `comments` LONGBLOB NULL DEFAULT NULL ; +ALTER TABLE `www_users` CHANGE `modulesallowed` `modulesallowed` VARCHAR( 25 ) NOT NULL; +INSERT INTO scripts VALUES ('CostUpdate','10','NB Not a script but allows users to maintain item costs from withing StockCostUpdate.php'); +CREATE TABLE `custitem` ( + `debtorno` char(10) NOT NULL DEFAULT '', + `stockid` varchar(20) NOT NULL DEFAULT '', + `cust_part` varchar(20) NOT NULL DEFAULT '', + `cust_description` varchar(30) NOT NULL DEFAULT '', + `customersuom` char(50) NOT NULL DEFAULT '', + `conversionfactor` double NOT NULL DEFAULT '1', + PRIMARY KEY (`debtorno`,`stockid`), + KEY `StockID` (`stockid`), + KEY `Debtorno` (`debtorno`), + CONSTRAINT ` custitem _ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`), + CONSTRAINT ` custitem _ibfk_2` FOREIGN KEY (`debtorno`) REFERENCES `debtorsmaster` (`debtorno`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER table pricematrix ADD column currabrev char(3) NOT NULL DEFAULT ''; +ALTER table pricematrix ADD column startdate date NOT NULL DEFAULT '0000-00-00'; +ALTER table pricematrix ADD column enddate date NOT NULL DEFAULT '9999-12-31'; +ALTER table pricematrix DROP PRIMARY KEY; +ALTER table pricematrix ADD PRIMARY KEY (`salestype`,`stockid`,`currabrev`,`quantitybreak`,`startdate`,`enddate`); +ALTER table pricematrix DROP KEY `DiscountCategory`; +ALTER table pricematrix ADD KEY currabrev(`currabrev`); +ALTER table pricematrix ADD KEY stockid(`stockid`); +ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT ''; +ALTER TABLE `workorders` ADD `closecomments` LONGBLOB NULL DEFAULT NULL ; + +CREATE TABLE IF NOT EXISTS `relateditems` ( + `stockid` varchar(20) CHARACTER SET utf8 NOT NULL, + `related` varchar(20) CHARACTER SET utf8 NOT NULL, + PRIMARY KEY (`stockid`,`related`), + UNIQUE KEY `Related` (`related`,`stockid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('RelatedItemsUpdate.php', '2', 'Maintains Related Items'); +INSERT INTO scripts VALUES('Z_ImportDebtors.php',15,'Import debtors by csv file'); +ALTER table purchorders MODIFY tel varchar(30) NOT NULL DEFAULT ''; + +ALTER TABLE banktrans DROP KEY ref_10, DROP KEY ref_9, DROP KEY ref_8, DROP KEY ref_7; +ALTER TABLE banktrans DROP KEY ref_6, DROP KEY ref_5, DROP KEY ref_4, DROP KEY ref_3, DROP KEY ref_2; +ALTER TABLE gltrans DROP KEY tag_2, DROP KEY tag_3, DROP KEY tag_4; +ALTER TABLE mrpdemandtypes DROP KEY mrpdemandtype; +ALTER TABLE salescatprod DROP KEY manufacturers_id_2; +ALTER TABLE salescatprod DROP KEY manufacturers_id; +ALTER TABLE stockrequest DROP KEY departmentid_2; +ALTER TABLE stockrequest DROP KEY loccode_2; +ALTER TABLE stockrequestitems DROP KEY stockid_2, DROP KEY dispatchid_2; +INSERT INTO scripts VALUES('Dashboard.php',1,'Display outstanding debtors, creditors etc'); + +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('Z_MakeLocUsers.php', '15', 'Create User Location records'); +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('LocationUsers.php', '15', 'User Location Maintenance'); +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('AgedControlledInventory.php', '11', 'Report of Controlled Items and their age'); + +CREATE TABLE IF NOT EXISTS `locationusers` ( + `loccode` varchar(5) NOT NULL, + `userid` varchar(20) NOT NULL, + `canview` tinyint(4) NOT NULL DEFAULT '0', + `canupd` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`loccode`,`userid`), + KEY `UserId` (`userid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO locationusers (userid, loccode, canview, canupd) + SELECT www_users.userid, locations.loccode,1,1 + FROM www_users CROSS JOIN locations + LEFT JOIN locationusers + ON www_users.userid = locationusers.userid + AND locations.loccode = locationusers.loccode + WHERE locationusers.userid IS NULL; + +ALTER TABLE `mrpparameters` ADD `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER `usemrpdemands`; + +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('WOCanBeProducedNow.php', '4', 'List of WO items that can be produced with available stock in location'); +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PrintWOItemSlip.php', '4', 'PDF WO Item production Slip '); + +ALTER TABLE `locations` ADD `usedforwo` TINYINT( 4 ) NOT NULL DEFAULT '1' AFTER `internalrequest`; +ALTER TABLE `bankaccounts` ADD `importformat` VARCHAR( 10 ) NOT NULL DEFAULT ''; +ALTER TABLE `audittrail` ADD INDEX ( `transactiondate` ); +ALTER TABLE stockmoves MODIFY price DECIMAL(21,5) NOT NULL DEFAULT '0.00000'; + +INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('SalesTopCustomersInquiry.php', 2, 'Shows the sales to the top customers'); +ALTER TABLE `stockmoves` ADD `userid` VARCHAR( 20 ) NOT NULL , ADD INDEX ( `userid` ) ; + +UPDATE config SET confvalue='4.11.5' WHERE confname='VersionNumber'; + + + Property changes on: trunk/sql/mysql/upgrade4.11.3-4.11.4.sql ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property |
From: <dai...@us...> - 2015-02-07 03:24:46
|
Revision: 7134 http://sourceforge.net/p/web-erp/reponame/7134 Author: daintree Date: 2015-02-07 03:24:43 +0000 (Sat, 07 Feb 2015) Log Message: ----------- New customer account script - very similar to CustmerInquiry ?? Added Paths: ----------- trunk/CustomerAccount.php Added: trunk/CustomerAccount.php =================================================================== --- trunk/CustomerAccount.php (rev 0) +++ trunk/CustomerAccount.php 2015-02-07 03:24:43 UTC (rev 7134) @@ -0,0 +1,428 @@ +<?php +/* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/ + +include('includes/session.inc'); +$Title = _('Customer Account'); +/* Manual links before header.inc */ +$ViewTopic = 'ARInquiries'; // Filename in ManualContents.php's TOC. +$BookMark = 'CustomerAccount'; // Anchor's id in the manual's html document. +include('includes/header.inc'); + +// always figure out the SQL required from the inputs available + +if (!isset($_GET['CustomerID']) and !isset($_SESSION['CustomerID'])) { + prnMsg(_('To display the account a customer must first be selected from the customer selection screen'), 'info'); + echo '<br /><div class="centre"><a href="', $RootPath, '/SelectCustomer.php">', _('Select a Customer Account to Display'), '</a></div>'; + include('includes/footer.inc'); + exit; +} else { + if (isset($_GET['CustomerID'])) { + $_SESSION['CustomerID'] = stripslashes($_GET['CustomerID']); + } + $CustomerID = $_SESSION['CustomerID']; +} +//Check if the users have proper authority +if ($_SESSION['SalesmanLogin'] != '') { + $ViewAllowed = false; + $sql = "SELECT salesman FROM custbranch WHERE debtorno = '" . $CustomerID . "'"; + $ErrMsg = _('Failed to retrieve sales data'); + $result = DB_query($sql,$ErrMsg); + if(DB_num_rows($result)>0) { + while($myrow = DB_fetch_array($result)) { + if ($_SESSION['SalesmanLogin'] == $myrow['salesman']){ + $ViewAllowed = true; + } + } + } else { + prnMsg(_('There is no salesman data set for this customer'),'error'); + include('includes/footer.inc'); + exit; + } + if (!$ViewAllowed){ + prnMsg(_('You have no authority to review this customer account'),'error'); + include('includes/footer.inc'); + exit; + } +} + + +if (!isset($_POST['TransAfterDate'])) { + $_POST['TransAfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))); +} + +$Transactions = array(); + +/*now get all the settled transactions which were allocated this month */ +$ErrMsg = _('There was a problem retrieving the transactions that were settled over the course of the last month for'). ' ' . $CustomerID . ' ' . _('from the database'); +if ($_SESSION['Show_Settled_LastMonth']==1){ + $sql = "SELECT DISTINCT debtortrans.id, + debtortrans.type, + systypes.typename, + debtortrans.branchcode, + debtortrans.reference, + debtortrans.invtext, + debtortrans.order_, + debtortrans.transno, + debtortrans.trandate, + debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst AS totalamount, + debtortrans.alloc, + debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc AS balance, + debtortrans.settled + FROM debtortrans INNER JOIN systypes + ON debtortrans.type=systypes.typeid + INNER JOIN custallocns + ON (debtortrans.id=custallocns.transid_allocfrom + OR debtortrans.id=custallocns.transid_allocto) + WHERE custallocns.datealloc >='" . FormatDateForSQL($_POST['TransAfterDate']) . "' + AND debtortrans.debtorno='" . $CustomerID . "' + AND debtortrans.settled=1 + ORDER BY debtortrans.id"; + + $SetldTrans=DB_query($sql, $ErrMsg); + $NumberOfRecordsReturned = DB_num_rows($SetldTrans); + while ($myrow=DB_fetch_array($SetldTrans)){ + $Transactions[] = $myrow; + } +} else { + $NumberOfRecordsReturned=0; +} + +/*now get all the outstanding transaction ie Settled=0 */ +$ErrMsg = _('There was a problem retrieving the outstanding transactions for') . ' ' . $CustomerID . ' '. _('from the database') . '.'; +$sql = "SELECT debtortrans.id, + debtortrans.type, + systypes.typename, + debtortrans.branchcode, + debtortrans.reference, + debtortrans.invtext, + debtortrans.order_, + debtortrans.transno, + debtortrans.trandate, + debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst as totalamount, + debtortrans.alloc, + debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc as balance, + debtortrans.settled + FROM debtortrans INNER JOIN systypes + ON debtortrans.type=systypes.typeid + WHERE debtortrans.debtorno='" . $CustomerID . "' + AND debtortrans.settled=0"; + +if ($_SESSION['SalesmanLogin'] != '') { + $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; +} + +$sql .= " ORDER BY debtortrans.id"; + +$OstdgTrans=DB_query($sql, $ErrMsg); +while ($myrow=DB_fetch_array($OstdgTrans)){ + $Transactions[] = $myrow; +} + +$NumberOfRecordsReturned += DB_num_rows($OstdgTrans); + +$SQL = "SELECT debtorsmaster.name, + debtorsmaster.address1, + debtorsmaster.address2, + debtorsmaster.address3, + debtorsmaster.address4, + debtorsmaster.address5, + debtorsmaster.address6, + currencies.currency, + currencies.decimalplaces, + paymentterms.terms, + debtorsmaster.creditlimit, + holdreasons.dissallowinvoices, + holdreasons.reasondescription, + SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc) AS balance, + SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN + CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >= + paymentterms.daysbeforedue + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + ELSE + CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1', 'MONTH') . "), " . interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= 0 + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + END) AS due, + Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN + CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue + AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= + (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + ELSE + CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1','MONTH') . "), " . interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') .")) >= " . $_SESSION['PastDueDays1'] . ") + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + END) AS overdue1, + Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN + CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue + AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + + " . $_SESSION['PastDueDays2'] . ") + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + ELSE + CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1','MONTH') . "), " . + interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) + >= " . $_SESSION['PastDueDays2'] . ") + THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + + debtortrans.ovdiscount - debtortrans.alloc + ELSE 0 END + END) AS overdue2 + FROM debtorsmaster INNER JOIN paymentterms + ON debtorsmaster.paymentterms = paymentterms.termsindicator + INNER JOIN currencies + ON debtorsmaster.currcode = currencies.currabrev + INNER JOIN holdreasons + ON debtorsmaster.holdreason = holdreasons.reasoncode + INNER JOIN debtortrans + ON debtorsmaster.debtorno = debtortrans.debtorno + WHERE + debtorsmaster.debtorno = '" . $CustomerID . "'"; + +if ($_SESSION['SalesmanLogin'] != '') { + $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; +} + +$SQL .= " GROUP BY + debtorsmaster.name, + debtorsmaster.address1, + debtorsmaster.address2, + debtorsmaster.address3, + debtorsmaster.address4, + debtorsmaster.address5, + debtorsmaster.address6, + currencies.decimalplaces, + currencies.currency, + paymentterms.terms, + paymentterms.daysbeforedue, + paymentterms.dayinfollowingmonth, + debtorsmaster.creditlimit, + holdreasons.dissallowinvoices, + holdreasons.reasondescription"; + +$ErrMsg = _('The customer details could not be retrieved by the SQL because'); +$CustomerResult = DB_query($SQL, $ErrMsg); + +$CustomerRecord = DB_fetch_array($CustomerResult); + +echo '<div class="toplink"> + <a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a> + </div>'; + +echo '<table width="100%"> + <tr> + <th colspan="2">' . _('Customer Statement For'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '</th> + </tr> + <tr><td colspan="2">' . $CustomerRecord['address1'] . '</td></tr> + <tr><td colspan="2">' . $CustomerRecord['address2'] . '</td></tr> + <tr><td colspan="2">' . $CustomerRecord['address3'] . ' ' . $CustomerRecord['address4'] . ' ' . $CustomerRecord['address5'] . ' ' . $CustomerRecord['address6'] . '</td></tr> + <tr><th>' . _('All amounts stated in'), ':</th><td>', $CustomerRecord['currency'] . '</td></tr> + <tr><th>' . _('Terms'), ':</th><td>', $CustomerRecord['terms'] . '</th></tr> + <tr><th>' . _('Credit Limit'), ':</th><td>', locale_number_format($CustomerRecord['creditlimit'], 0) . '</td></tr> + <tr><th>' . _('Credit Status'), ':</th><td>', $CustomerRecord['reasondescription'] . '</td></tr> + </table>'; + +if ($CustomerRecord['dissallowinvoices'] != 0) { + echo '<br /><font color="red" size="4"><b>', _('ACCOUNT ON HOLD'), '</font></b><br />'; +} +echo '<form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint"> + <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />'; +echo _('Show all transactions after'), ':<input tabindex="1" type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />'; + +echo '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" /> + </form>'; + +/* Show a table of the invoices returned by the SQL. */ + +echo '<table class="selection"> + <tr> + <th class="ascending">', _('Type'), '</th> + <th class="ascending">', _('Number'), '</th> + <th class="ascending">', _('Date'), '</th> + <th>', _('Branch'), '</th> + <th class="ascending">', _('Reference'), '</th> + <th>', _('Comments'), '</th> + <th>', _('Order'), '</th> + <th>', _('Charges'), '</th> + <th>', _('Credits'), '</th> + <th>', _('Allocated'), '</th> + <th>', _('Balance'), '</th> + <th></th> + <th></th> + <th></th> + <th></th> + </tr>'; + +$k = 0; //row colour counter +$OutstandingOrSettled = ''; +if ($_SESSION['InvoicePortraitFormat'] == 1) { //Invoice/credits in portrait + $PrintCustomerTransactionScript = 'PrintCustTransPortrait.php'; +} else { //produce pdfs in landscape + $PrintCustomerTransactionScript = 'PrintCustTrans.php'; +} +foreach ($Transactions as $MyRow) { + + if ($MyRow['settled']==1 AND $OutstandingOrSettled==''){ + echo '<tr><th colspan="10">' . _('TRANSACTIONS SETTLED SINCE') . ' ' . $_POST['TransAfterDate'] . '</th></tr>'; + $OutstandingOrSettled='Settled'; + } elseif (($OutstandingOrSettled=='Settled' OR $OutstandingOrSettled=='') AND $MyRow['settled']==0) { + echo '<tr><th colspan="10">' . _('OUTSTANDING TRANSACTIONS') . ' ' . $_POST['TransAfterDate'] . '</th></tr>'; + $OutstandingOrSettled='Outstanding'; + } + + if ($k == 1) { + echo '<tr class="EvenTableRows">'; + $k = 0; + } else { + echo '<tr class="OddTableRows">'; + $k = 1; + } + + + $FormatedTranDate = ConvertSQLDate($MyRow['trandate']); + + + if ($MyRow['type']==10) { //its an invoice + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + </a> + </td> + <td></td> + </tr>'; + + } elseif ($MyRow['type'] == 11) { + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td></td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + </tr>'; + + } elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] < 0) { + /* Show transactions where: + * - Is receipt + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td></td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + <td></td> + <td></td> + <td></td> + </tr>'; + + } elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] > 0) { + /* Show transactions where: + * - Is a negative receipt + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr>'; + } +} +//end of while loop + +echo '</table>'; + +echo '<table class="selection" width="70%"> + <tr> + <th style="width:20%">', _('Total Balance'), '</th> + <th style="width:20%">', _('Current'), '</th> + <th style="width:20%">', _('Now Due'), '</th> + <th style="width:20%">', $_SESSION['PastDueDays1'], '-', $_SESSION['PastDueDays2'], ' ' . _('Days Overdue'), '</th> + <th style="width:20%">', _('Over'), ' ', $_SESSION['PastDueDays2'], ' ', _('Days Overdue'), '</th> + </tr>'; + +echo '<tr> + <td class="number">', locale_number_format($CustomerRecord['balance'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['balance'] - $CustomerRecord['due']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['due'] - $CustomerRecord['overdue1']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['overdue1'] - $CustomerRecord['overdue2']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($CustomerRecord['overdue2'], $CustomerRecord['decimalplaces']), '</td> + </tr> +</table>'; + + +include('includes/footer.inc'); +?> \ No newline at end of file |
From: <dai...@us...> - 2015-02-07 03:24:01
|
Revision: 7133 http://sourceforge.net/p/web-erp/reponame/7133 Author: daintree Date: 2015-02-07 03:23:51 +0000 (Sat, 07 Feb 2015) Log Message: ----------- email.gif in css/images not email.png Modified Paths: -------------- trunk/CustomerInquiry.php trunk/SelectCustomer.php trunk/SelectOrderItems.php trunk/build/make_release.sh trunk/includes/header.inc trunk/sql/mysql/upgrade4.12-4.13.sql Modified: trunk/CustomerInquiry.php =================================================================== --- trunk/CustomerInquiry.php 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/CustomerInquiry.php 2015-02-07 03:23:51 UTC (rev 7133) @@ -317,7 +317,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email '), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td> @@ -359,7 +359,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -396,7 +396,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -430,7 +430,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> @@ -472,7 +472,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> Modified: trunk/SelectCustomer.php =================================================================== --- trunk/SelectCustomer.php 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/SelectCustomer.php 2015-02-07 03:23:51 UTC (rev 7133) @@ -219,6 +219,7 @@ echo '<tr><td valign="top" class="select">'; /* Customer Inquiry Options */ echo '<a href="' . $RootPath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Transaction Inquiries') . '</a><br />'; + echo '<a href="' . $RootPath . '/CustomerAccount.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Account statement on screen') . '</a><br />'; echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />'; echo '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />'; echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />'; Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/SelectOrderItems.php 2015-02-07 03:23:51 UTC (rev 7133) @@ -1729,7 +1729,6 @@ </tr> </table> </div>'; - echo $jsCall; }#end if SearchResults to show } /*end of PartSearch options to be displayed */ @@ -1845,4 +1844,4 @@ $result = DB_query($sql,$ErrMsg,$DbgMsg); return $result; } -?> +?> \ No newline at end of file Modified: trunk/build/make_release.sh =================================================================== --- trunk/build/make_release.sh 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/build/make_release.sh 2015-02-07 03:23:51 UTC (rev 7133) @@ -26,6 +26,7 @@ msgmerge -U -N --backup=off locale/it_IT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U -N --backup=off locale/ja_JP.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U -N --backup=off locale/lv_LV.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot +msgmerge -U -N --backup=off locale/mr_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U -N --backup=off locale/nl_NL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U -N --backup=off locale/pl_PL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot msgmerge -U -N --backup=off locale/pt_BR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot @@ -50,6 +51,7 @@ msgfmt -o locale/es_ES.utf8/LC_MESSAGES/messages.mo locale/es_ES.utf8/LC_MESSAGES/messages.po msgfmt -o locale/et_EE.utf8/LC_MESSAGES/messages.mo locale/et_EE.utf8/LC_MESSAGES/messages.po msgfmt -o locale/fa_IR.utf8/LC_MESSAGES/messages.mo locale/fa_IR.utf8/LC_MESSAGES/messages.po +msgfmt -o locale/fr_CA.utf8/LC_MESSAGES/messages.mo locale/fr_CA.utf8/LC_MESSAGES/messages.po msgfmt -o locale/fr_FR.utf8/LC_MESSAGES/messages.mo locale/fr_FR.utf8/LC_MESSAGES/messages.po msgfmt -o locale/hr_HR.utf8/LC_MESSAGES/messages.mo locale/hr_HR.utf8/LC_MESSAGES/messages.po msgfmt -o locale/hi_IN.utf8/LC_MESSAGES/messages.mo locale/hi_IN.utf8/LC_MESSAGES/messages.po @@ -58,6 +60,7 @@ msgfmt -o locale/it_IT.utf8/LC_MESSAGES/messages.mo locale/it_IT.utf8/LC_MESSAGES/messages.po msgfmt -o locale/ja_JP.utf8/LC_MESSAGES/messages.mo locale/ja_JP.utf8/LC_MESSAGES/messages.po msgfmt -o locale/lv_LV.utf8/LC_MESSAGES/messages.mo locale/lv_LV.utf8/LC_MESSAGES/messages.po +msgfmt -o locale/mr_IN.utf8/LC_MESSAGES/messages.mo locale/mr_IN.utf8/LC_MESSAGES/messages.po msgfmt -o locale/nl_NL.utf8/LC_MESSAGES/messages.mo locale/nl_NL.utf8/LC_MESSAGES/messages.po msgfmt -o locale/pl_PL.utf8/LC_MESSAGES/messages.mo locale/pl_PL.utf8/LC_MESSAGES/messages.po msgfmt -o locale/pt_BR.utf8/LC_MESSAGES/messages.mo locale/pt_BR.utf8/LC_MESSAGES/messages.po Modified: trunk/includes/header.inc =================================================================== --- trunk/includes/header.inc 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/includes/header.inc 2015-02-07 03:23:51 UTC (rev 7133) @@ -96,4 +96,4 @@ echo '<div id="BodyDiv">'; echo '<div id="BodyWrapDiv">'; -?> +?> \ No newline at end of file Modified: trunk/sql/mysql/upgrade4.12-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-06 18:47:10 UTC (rev 7132) +++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-07 03:23:51 UTC (rev 7133) @@ -1,6 +1,3 @@ -INSERT INTO `securitygroups` VALUES (8,16); --- Add a description for the script: -UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php'; +INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF'); - -----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; \ No newline at end of file |
From: <rc...@us...> - 2015-02-06 18:47:12
|
Revision: 7132 http://sourceforge.net/p/web-erp/reponame/7132 Author: rchacon Date: 2015-02-06 18:47:10 +0000 (Fri, 06 Feb 2015) Log Message: ----------- Spanish translation improvements. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-06 16:24:03 UTC (rev 7131) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-06 18:47:10 UTC (rev 7132) @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: webERP 4.11.5\n" +"Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-06 19:17+1300\n" -"PO-Revision-Date: 2015-01-31 12:03-0600\n" +"PO-Revision-Date: 2015-02-06 12:45-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -3676,7 +3676,7 @@ #: Suppliers.php:988 SupplierTenderCreate.php:415 SuppLoginSetup.php:145 #: WWW_Users.php:491 ../webSHOP/Checkout.php:578 msgid "Email Address" -msgstr "Correo electrónico" +msgstr "Dirección de correo electrónico" #: CompanyPreferences.php:229 msgid "" @@ -5662,7 +5662,7 @@ #: InternalStockRequest.php:273 SelectWorkOrder.php:334 #: WhereUsedInquiry.php:75 WorkOrderCosting.php:99 msgid "Quantity Required" -msgstr "Cantidad Requerida" +msgstr "Cantidad requerida" #: ContractOtherReqts.php:163 msgid "Cost Per Unit" @@ -7956,7 +7956,7 @@ #: CustEDISetup.php:138 CustEDISetup.php:141 msgid "Email Attachments" -msgstr "Adjuntos del correo-e" +msgstr "Adjuntos de correo-e" #: CustEDISetup.php:139 CustEDISetup.php:142 msgid "File Transfer Protocol (FTP)" @@ -12159,7 +12159,7 @@ #: EmailConfirmation.php:150 EmailConfirmation.php:289 msgid "Email Confirmation" -msgstr "Confirmación de Email" +msgstr "Confirmación de correo-e" #: EmailConfirmation.php:176 EmailConfirmation.php:297 msgid "Order Acknowledgement" @@ -16061,7 +16061,7 @@ #: InternalStockRequest.php:166 msgid "Quantity Requested" -msgstr "Cantidad Requerida" +msgstr "Cantidad solicitada" #: InternalStockRequest.php:173 msgid "Update Line" @@ -16591,7 +16591,7 @@ #: Labels.php:441 PDFWOPrint.php:655 msgid "Label Description" -msgstr "Descripción de etiqueta" +msgstr "Descripción en etiqueta" #: Labels.php:445 msgid "Label Paper Size" @@ -16607,7 +16607,7 @@ #: Labels.php:511 msgid "Label Width" -msgstr "Ancho de Etiqueta" +msgstr "Ancho de etiqueta" #: Labels.php:515 msgid "Top Margin" @@ -16657,7 +16657,7 @@ #: Labels.php:645 PDFPrintLabel.php:15 PDFPrintLabel.php:109 #: PDFWOPrint.php:598 msgid "Print Labels" -msgstr "Imprimir Etiquetas" +msgstr "Imprimir etiquetas" #: Locations.php:5 msgid "Location Maintenance" @@ -17339,7 +17339,7 @@ #: Manufacturers.php:8 includes/MainMenuLinksArray.php:273 msgid "Brands Maintenance" -msgstr "" +msgstr "Administrar marcas" #: Manufacturers.php:77 msgid "manufacturer record because" @@ -17389,11 +17389,11 @@ #: Manufacturers.php:192 msgid "Brand Code" -msgstr "" +msgstr "Código de marca" #: Manufacturers.php:193 Manufacturers.php:292 msgid "Brand Name" -msgstr "" +msgstr "Nombre de marca" #: Manufacturers.php:194 Manufacturers.php:296 msgid "Brand URL" @@ -17410,7 +17410,7 @@ #: Manufacturers.php:252 SalesCategories.php:510 msgid "Brand" -msgstr "" +msgstr "Marca" #: Manufacturers.php:272 msgid "Amend Brand Details" @@ -17422,7 +17422,7 @@ #: Manufacturers.php:300 msgid "Brand Image File (.jpg)" -msgstr "Archivo de imagen (.jpg)" +msgstr "Archivo de imagen de marca (.jpg)" #: MaterialsNotUsed.php:6 msgid "Raw Materials Not Used Anywhere" @@ -20403,7 +20403,7 @@ #: PDFFGLabel.php:199 PDFFGLabel.php:205 PDFWOPrint.php:494 PDFWOPrint.php:500 msgid "Email a Work Order" -msgstr "" +msgstr "Enviar orden de trabajo por correo-e" #: PDFFGLabel.php:202 PDFWOPrint.php:258 PDFWOPrint.php:497 #: includes/DatabaseTranslations.php:49 @@ -20421,7 +20421,7 @@ #: PDFFGLabel.php:208 PDFWOPrint.php:503 msgid "Emailing Work order" -msgstr "" +msgstr "Enviando orden de trabajo por correo-e" #: PDFFGLabel.php:208 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358 #: Z_ChangeStockCode.php:169 @@ -21127,7 +21127,7 @@ #: PDFSalesBySalesperson.php:15 PDFWeeklyOrders.php:15 msgid "Weekly Orders" -msgstr "" +msgstr "Pedidos semanales" #: PDFSalesBySalesperson.php:17 PDFWeeklyOrders.php:17 msgid "There are no members of the Weekly Orders Recipients email group" @@ -21330,7 +21330,7 @@ #: PDFStockLocTransfer.php:46 PDFStockTransfer.php:51 msgid "Print Shipping Labels" -msgstr "" +msgstr "Imprimir etiquetas de envío" #: PDFStockLocTransfer.php:55 PDFStockLocTransfer.php:56 msgid "Inventory Location Transfer BOL" @@ -21388,7 +21388,7 @@ #: PDFStockTransfer.php:20 msgid "Print Stock Transfer" -msgstr "Imprimir Transferencia de Existencias" +msgstr "Imprimir traslado de inventario" #: PDFStockTransfer.php:22 PDFStockTransfer.php:34 StockTransfers.php:453 msgid "Print Transfer Note" @@ -21396,7 +21396,7 @@ #: PDFStockTransfer.php:28 msgid "Print Stock Transfer Note" -msgstr "Imprimir nota de Transferencia de Existencia" +msgstr "Imprimir nota de traslado de inventario" #: PDFStockTransfer.php:63 msgid "Stock Transfer Form" @@ -21453,7 +21453,7 @@ #: PDFWOPrint.php:98 PDFWOPrint.php:187 msgid "Select Work Order" -msgstr "" +msgstr "Seleccionar orden de trabajo" #: PDFWOPrint.php:108 msgid "This page must be called with a Work order number to print" @@ -21490,7 +21490,7 @@ #: PDFWOPrint.php:579 PDFWOPrint.php:662 PO_PDFPurchOrder.php:388 msgid "Print or Email the Order" -msgstr "Imprimir el Pedido ó Enviarlo por Correo Electrónico" +msgstr "Imprimir o enviar el pedido por correo-e" #: PDFWOPrint.php:610 msgid "There was a problem retrieving the contact details for the location" @@ -21498,7 +21498,7 @@ #: PDFWOPrint.php:623 PDFWOPrint.php:692 PO_PDFPurchOrder.php:429 msgid "Email to" -msgstr "Enviar por correo electrónico a" +msgstr "Enviar correo-e a" #: PDFWOPrint.php:637 SelectWorkOrder.php:332 msgid "Paperwork" @@ -21506,23 +21506,23 @@ #: PDFWOPrint.php:654 msgid "Label Item" -msgstr "" +msgstr "Artículo en etiqueta" #: PDFWOPrint.php:656 msgid "Label Lot" -msgstr "" +msgstr "Lote en etiqueta" #: PDFWOPrint.php:657 msgid "No of Full Packages" -msgstr "" +msgstr "Cantidad de paquetes completos" #: PDFWOPrint.php:658 msgid "Labels/Package" -msgstr "" +msgstr "Etiquetas/Paquete" #: PDFWOPrint.php:659 msgid "Weight/Package" -msgstr "" +msgstr "Peso/Paquete" #: PDFWOPrint.php:660 msgid "LeftOver Qty" @@ -21530,7 +21530,7 @@ #: PDFWOPrint.php:705 msgid "Labels" -msgstr "" +msgstr "Etiquetas" #: PeriodsInquiry.php:7 msgid "Periods Inquiry" @@ -22648,7 +22648,7 @@ #: PO_PDFPurchOrder.php:358 msgid "Emailing Purchase order" -msgstr "Enviando prden de compra por correo-e" +msgstr "Enviando orden de compra por correo-e" #: PO_PDFPurchOrder.php:362 msgid "Printed by" @@ -23792,7 +23792,7 @@ #: PrintCustStatements.php:103 PrintCustStatements.php:442 #: includes/MainMenuLinksArray.php:105 msgid "Print Statements" -msgstr "Imprimir Estado de Cuentas" +msgstr "Imprimir estados de cuenta" #: PrintCustStatements.php:103 msgid "No Customers Found" @@ -23942,7 +23942,7 @@ #: PrintCustTrans.php:509 PrintCustTransPortrait.php:537 msgid "Emailing" -msgstr "Enviando email" +msgstr "Enviando correo-e" #: PrintCustTrans.php:527 PrintCustTransPortrait.php:554 msgid "Select Invoices/Credit Notes To Print" @@ -25358,7 +25358,7 @@ #: ReprintGRN.php:89 SelectWorkOrder.php:335 StockLocTransferReceive.php:461 #: WorkOrderCosting.php:101 WorkOrderReceive.php:999 msgid "Quantity Received" -msgstr "Cantidades recibidas" +msgstr "Cantidad recibida" #: ReprintGRN.php:108 msgid "Reprint GRN " @@ -28118,7 +28118,7 @@ #: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123 #: StockSerialItems.php:127 StockStatus.php:95 msgid "Quantity On Hand" -msgstr "Cantidad Disponible" +msgstr "Cantidad disponible" #: SelectProduct.php:316 msgid "Quantity Demand" @@ -28708,7 +28708,7 @@ #: SelectWorkOrder.php:368 #, php-format msgid "Print W/O" -msgstr "" +msgstr "Imprimir orden de trabajo" #: SellThroughSupport.php:6 msgid "Sell Through Support" @@ -31356,7 +31356,7 @@ #: StockLocMovements.php:98 msgid "Quantity on Hand" -msgstr "Cantidad en Mano" +msgstr "Cantidad disponible" #: StockLocStatus.php:7 msgid "All Stock Status By Location/Category" @@ -31712,7 +31712,7 @@ #: StockLocTransferReceive.php:462 msgid "Quantity To Receive" -msgstr "Cantidades a recibir" +msgstr "Cantidad a recibir" #: StockLocTransferReceive.php:464 msgid "Cancel Balance" @@ -37819,11 +37819,11 @@ #: UserLocations.php:5 includes/MainMenuLinksArray.php:525 msgid "User Authorised Inventory Locations Maintenance" -msgstr "" +msgstr "Administrar ubicaciones de inventario autorizadas por usuario" #: UserLocations.php:10 msgid "User Authorised Locations" -msgstr "" +msgstr "Ubicaciones autorizadas por usuario" #: UserLocations.php:33 msgid "You have not selected any User" @@ -39710,7 +39710,7 @@ #: Z_ChangeGLAccountCode.php:6 msgid "UTILITY PAGE Change A GL Account Code" -msgstr "" +msgstr "PÁGINA UTILITARIA - Cambiar un código de cuenta contable" #: Z_ChangeGLAccountCode.php:12 Z_ChangeGLAccountCode.php:13 #: includes/MainMenuLinksArray.php:551 @@ -39806,7 +39806,7 @@ #: Z_ChangeLocationCode.php:6 msgid "UTILITY PAGE Change A Location Code" -msgstr "PÁGINA DE HERRAMIENTAS Cambiar un Código de Localidad" +msgstr "PÁGINA UTILITARIA - Cambiar un código de ubicación" #: Z_ChangeLocationCode.php:12 Z_ChangeLocationCode.php:13 #: includes/MainMenuLinksArray.php:552 @@ -40063,7 +40063,7 @@ #: Z_ChangeStockCategory.php:6 msgid "UTILITY PAGE Change A Stock Category" -msgstr "PÁGINA DE UTILIDAD Cambia una Categoría de Existencia" +msgstr "PÁGINA UTILITARIA - Cambiar una categoría de inventario" #: Z_ChangeStockCategory.php:12 Z_ChangeStockCategory.php:13 #: includes/MainMenuLinksArray.php:549 @@ -40159,7 +40159,7 @@ #: Z_ChangeStockCode.php:8 msgid "UTILITY PAGE Change A Stock Code" -msgstr "PÁGINA DE SOPORTE Cambio de Código de Existencia" +msgstr "PÁGINA UTILITARIA - Cambiar un código de inventario" #: Z_ChangeStockCode.php:14 Z_ChangeStockCode.php:15 #: includes/MainMenuLinksArray.php:550 @@ -41883,7 +41883,7 @@ #: Z_poAddLanguage.php:31 msgid "Utility to create a new language file" -msgstr "Utilidad para crear un nuevo archivo de idioma" +msgstr "Utilitario para crear un nuevo archivo de idioma" #: Z_poAddLanguage.php:32 Z_poEditLangHeader.php:22 Z_poEditLangModule.php:24 #: Z_poEditLangRemaining.php:25 @@ -41936,7 +41936,7 @@ #: Z_poAdmin.php:9 msgid "UTILITY PAGE" -msgstr "PÁGINA DE UTILIDADES" +msgstr "PÁGINA UTILITARIA" #: Z_poAdmin.php:9 msgid "that helps maintain language files" @@ -41993,7 +41993,7 @@ #: Z_poEditLangHeader.php:21 msgid "Utility to edit a language file header" -msgstr "Utilidad para editar un encabezado de archivo de idioma" +msgstr "Utilitario para editar un encabezado de archivo de idioma" #: Z_poEditLangHeader.php:41 msgid "Writing the language file header" @@ -42057,7 +42057,7 @@ #: Z_poEditLangModule.php:23 Z_poEditLangRemaining.php:24 msgid "Utility to edit a language file module" -msgstr "Utilidad para editar un módulo de archivo de idioma" +msgstr "Utilitario para editar un módulo de archivo de idioma" #: Z_poEditLangModule.php:70 Z_poEditLangRemaining.php:46 msgid "Writing the language file" @@ -42105,7 +42105,7 @@ #: Z_poRebuildDefault.php:27 msgid "Utility page to rebuild the system default language file" msgstr "" -"Utilidad de la página para reconstruir el archivo de idioma del sistema por " +"Página utilitaria para reconstruir el archivo de idioma del sistema por " "defecto" #: Z_poRebuildDefault.php:37 @@ -44511,7 +44511,7 @@ #: includes/DefineLabelClass.php:8 msgid "Label id" -msgstr "ID de Etiqueta" +msgstr "Identificación de etiqueta" #: includes/DefineLabelClass.php:23 msgid "Rows per sheet" @@ -44531,11 +44531,11 @@ #: includes/DefineLabelClass.php:27 msgid "Label height" -msgstr "Etiqueta de altura" +msgstr "Alto de etiqueta" #: includes/DefineLabelClass.php:28 msgid "Label width" -msgstr "Ancho de Etiqueta" +msgstr "Ancho de etiqueta" #: includes/DefineLabelClass.php:29 msgid "Top margin" @@ -45157,7 +45157,7 @@ #: includes/MainMenuLinksArray.php:231 msgid "Mail Inventory Valuation Report" -msgstr "" +msgstr "Enviar informe de valuación de inventario por correo" #: includes/MainMenuLinksArray.php:233 msgid "Inventory Planning Based On Preferred Supplier Data" @@ -46551,7 +46551,7 @@ #: includes/PDFWOPageHeader.inc:71 msgid "Quantity Reqd" -msgstr "" +msgstr "Cantidad requerida" #: includes/PO_PDFOrderPageHeader.inc:14 msgid "FOR VIEWING ONLY" @@ -48984,7 +48984,7 @@ #: api/api_xml-rpc.php:2223 msgid "Label Name" -msgstr "Etiqueta de Nombre" +msgstr "Nombre de etiqueta" #: api/api_xml-rpc.php:2224 msgid "The category label to search on." |
From: <rc...@us...> - 2015-02-06 15:27:43
|
Revision: 7130 http://sourceforge.net/p/web-erp/reponame/7130 Author: rchacon Date: 2015-02-06 15:27:41 +0000 (Fri, 06 Feb 2015) Log Message: ----------- Add upgrade 4.12.2 - 4.13. Modified Paths: -------------- trunk/sql/mysql/upgrade4.12.1-4.12.2.sql Added Paths: ----------- trunk/sql/mysql/upgrade4.12.2-4.13.sql Modified: trunk/sql/mysql/upgrade4.12.1-4.12.2.sql =================================================================== --- trunk/sql/mysql/upgrade4.12.1-4.12.2.sql 2015-02-06 07:07:22 UTC (rev 7129) +++ trunk/sql/mysql/upgrade4.12.1-4.12.2.sql 2015-02-06 15:27:41 UTC (rev 7130) @@ -1,3 +1,7 @@ +-- webERP 4.12.2. +-- Release date: 2015-02-06. +-- + CREATE TABLE IF NOT EXISTS `locationusers` ( `loccode` varchar(5) NOT NULL, `userid` varchar(20) NOT NULL, @@ -10,4 +14,5 @@ INSERT INTO `locationusers` (`loccode`, `userid`, `canview`, `canupd`) SELECT loccode, userid,1,1 FROM locations, www_users; INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('LocationUsers.php', '15', 'Allows users that have permission to access a location to be defined'); -UPDATE config SET confvalue='4.12.2' WHERE confname='VersionNumber'; \ No newline at end of file +-- Update version number: +UPDATE config SET confvalue='4.12.2' WHERE confname='VersionNumber'; Added: trunk/sql/mysql/upgrade4.12.2-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12.2-4.13.sql (rev 0) +++ trunk/sql/mysql/upgrade4.12.2-4.13.sql 2015-02-06 15:27:41 UTC (rev 7130) @@ -0,0 +1,10 @@ +-- webERP 4.13. +-- Release date: yyyy-mm-dd. +-- + + + + + +-- Update version number: +UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; |