Changeset 64

Timestamp:

11/22/05 21:00:19

Author:

brieb

Message:

Fixed sort problems with invoices.
Formated notes on product screen.
Removed defaultlogo.png.

Files:

• trunk/modules/bms/install/tablecolumns.sql (modified) (1 diff)
• trunk/modules/bms/products_addedit.php (modified) (4 diffs)
• trunk/report/defaultlogo.png (deleted)

trunk/modules/bms/install/tablecolumns.sql

@@ -10 +10 @@
-INSERT INTO tablecolumns VALUES (46,3,'date','if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate)','left','',4,'',0,'','date');
-INSERT INTO tablecolumns VALUES (47,3,'client name / company','concat(\"<strong>\",if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company),\"</strong>\")','left','',5,'concat(clients.lastname,clients.firstname,clients.company)',0,'100%',NULL);
-INSERT INTO tablecolumns VALUES (48,3,'total','if(invoices.type!=\"VOID\",invoices.totalti,\"-----\")','right','sum(if(invoices.type!=\"VOID\",invoices.totalti,0))',6,'',0,'','currency');
-INSERT INTO tablecolumns VALUES (139,5,'id','lineitems.id','left','',0,'',0,'',NULL);
-
+
+
-INSERT INTO tablecolumns VALUES (51,5,'invoice id','lineitems.invoiceid','left','',1,'',0,'',NULL);
-INSERT INTO tablecolumns VALUES (52,5,'part #','products.partnumber','left','',4,'',0,'',NULL);

trunk/modules/bms/products_addedit.php

@@ -108 +108 @@
-                                        <td width="100%">
-                                                <label for="partnumber" >
-em>(must be unique)</em
+span class="notes"><em>(must be unique)</em></span
-                                                        <?PHP field_text("partnumber",$therecord["partnumber"],1,"Part number name cannot be blank.","",Array("size"=>"28","maxlength"=>"32","style"=>"width:98%","class"=>"important","tabindex"=>"20","onChange"=>"checkUnique('../../',this.value,this.name,'products','partnumber','".$therecord["id"]."')")); ?>
-                                                </label>
@@ -128 +128 @@
-                                <input name="description" type="text" id="description" style="width:98%" value="<?php echo htmlQuotes($therecord["description"])?>" size="34" maxlength="255" tabindex="40" />
-                        </label>
-small"><em>
-em></
+notes"><strong>Note:</strong> 
+
-                </fieldset>
-                
@@ -178 +178 @@
-                                </tr>
-                        </table>
-small"><em>Weight must be in lbs. in order for shipping to be estimated correctly.</em>
+notes"><strong>Note:</strong> Weight must be in lbs. in order for shipping to be estimated correctly.
-                </fieldset>
-                
@@ -193 +193 @@
-                        </label>
-                        <label for="isprepackaged">
-em>(product is not packed with any other product.)</em
+span class="notes"><em>(product is not packed with any other product.)</em></span
-                        </label>
-                        <label for="isoversized">
-em>(product must be delivered in a oversized box.)</em
+span class="notes"><em>(product must be delivered in a oversized box.)</em></span
-                        </label>
-                        </fieldset>