PostBooks ERP, accounting, CRM by xTuple

Revision: 7210
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7210&view=rev
Author:   sunsetsolutions
Date:     2009-10-15 19:31:42 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Issue #9591:new functions

Added Paths:
-----------
    xtupleserver/trunk/dbscripts/functions/attachquotetoopportunity.sql
    xtupleserver/trunk/dbscripts/functions/attachsalesordertoopportunity.sql
    xtupleserver/trunk/dbscripts/functions/calcquoteamt.sql
    xtupleserver/trunk/dbscripts/functions/calcsalesorderamt.sql

Added: xtupleserver/trunk/dbscripts/functions/attachquotetoopportunity.sql
===================================================================
--- xtupleserver/trunk/dbscripts/functions/attachquotetoopportunity.sql	                        (rev 0)
+++ xtupleserver/trunk/dbscripts/functions/attachquotetoopportunity.sql	2009-10-15 19:31:42 UTC (rev 7210)
@@ -0,0 +1,35 @@
+CREATE OR REPLACE FUNCTION attachQuoteToOpportunity(INTEGER, INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  pQuheadid	ALIAS FOR $1;
+  pOpheadid	ALIAS FOR $2;
+BEGIN
+
+-- Check Quote
+  IF (NOT EXISTS(SELECT quhead_id
+                 FROM quhead
+                 WHERE (quhead_id=pQuheadid))) THEN
+    RETURN -1;
+  END IF;
+
+-- Check Opportunity
+  IF (NOT EXISTS(SELECT ophead_id
+                 FROM ophead
+                 WHERE (ophead_id=pOpheadid))) THEN
+    RETURN -2;
+  END IF;
+
+-- Cannot attach if already attached
+  IF (EXISTS(SELECT quhead_id
+	     FROM quhead
+	     WHERE ((quhead_id=pQuheadid)
+	       AND  (quhead_ophead_id IS NOT NULL)))) THEN
+    RETURN -3;
+  END IF;
+
+  UPDATE quhead SET quhead_ophead_id=pOpheadid
+  WHERE (quhead_id=pQuheadid);
+
+  RETURN 0;
+
+END;
+$$ LANGUAGE 'plpgsql';

Added: xtupleserver/trunk/dbscripts/functions/attachsalesordertoopportunity.sql
===================================================================
--- xtupleserver/trunk/dbscripts/functions/attachsalesordertoopportunity.sql	                        (rev 0)
+++ xtupleserver/trunk/dbscripts/functions/attachsalesordertoopportunity.sql	2009-10-15 19:31:42 UTC (rev 7210)
@@ -0,0 +1,35 @@
+CREATE OR REPLACE FUNCTION attachSalesOrderToOpportunity(INTEGER, INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  pSoheadid	ALIAS FOR $1;
+  pOpheadid	ALIAS FOR $2;
+BEGIN
+
+-- Check Sales Order
+  IF (NOT EXISTS(SELECT cohead_id
+                 FROM cohead
+                 WHERE (cohead_id=pSoheadid))) THEN
+    RETURN -1;
+  END IF;
+
+-- Check Opportunity
+  IF (NOT EXISTS(SELECT ophead_id
+                 FROM ophead
+                 WHERE (ophead_id=pOpheadid))) THEN
+    RETURN -2;
+  END IF;
+
+-- Cannot attach if already attached
+  IF (EXISTS(SELECT cohead_id
+	     FROM cohead
+	     WHERE ((cohead_id=pSoheadid)
+	       AND  (cohead_ophead_id IS NOT NULL)))) THEN
+    RETURN -3;
+  END IF;
+
+  UPDATE cohead SET cohead_ophead_id=pOpheadid
+  WHERE (cohead_id=pSoheadid);
+
+  RETURN 0;
+
+END;
+$$ LANGUAGE 'plpgsql';

Added: xtupleserver/trunk/dbscripts/functions/calcquoteamt.sql
===================================================================
--- xtupleserver/trunk/dbscripts/functions/calcquoteamt.sql	                        (rev 0)
+++ xtupleserver/trunk/dbscripts/functions/calcquoteamt.sql	2009-10-15 19:31:42 UTC (rev 7210)
@@ -0,0 +1,31 @@
+CREATE OR REPLACE FUNCTION calcQuoteAmt(INTEGER) RETURNS NUMERIC AS $$
+DECLARE
+  pQuheadid ALIAS FOR $1;
+  _subtotal NUMERIC := 0;
+  _tax NUMERIC := 0;
+  _freight NUMERIC := 0;
+  _misc NUMERIC := 0;
+  _amount NUMERIC := 0;
+
+BEGIN
+
+  SELECT COALESCE(SUM(ROUND((quitem_qtyord * quitem_qty_invuomratio) *
+                            (quitem_price / quitem_price_invuomratio), 2)), 0) INTO _subtotal
+  FROM quitem
+  WHERE (quitem_quhead_id=pQuheadid);
+
+  SELECT COALESCE(SUM(tax), 0) INTO _tax
+  FROM ( SELECT ROUND(SUM(taxdetail_tax), 2) AS tax
+         FROM tax JOIN calculateTaxDetailSummary('Q', pQuheadid, 'T') ON (taxdetail_tax_id=tax_id)
+         GROUP BY tax_id ) AS data;
+
+  SELECT COALESCE(quhead_freight, 0), COALESCE(quhead_misc, 0) INTO _freight, _misc
+  FROM quhead
+  WHERE (quhead_id=pQuheadid);
+
+  _amount := _subtotal + _tax + _freight + _misc;
+
+  RETURN _amount;
+
+END;
+$$ LANGUAGE 'plpgsql';

Added: xtupleserver/trunk/dbscripts/functions/calcsalesorderamt.sql
===================================================================
--- xtupleserver/trunk/dbscripts/functions/calcsalesorderamt.sql	                        (rev 0)
+++ xtupleserver/trunk/dbscripts/functions/calcsalesorderamt.sql	2009-10-15 19:31:42 UTC (rev 7210)
@@ -0,0 +1,31 @@
+CREATE OR REPLACE FUNCTION calcSalesOrderAmt(INTEGER) RETURNS NUMERIC AS $$
+DECLARE
+  pCoheadid ALIAS FOR $1;
+  _subtotal NUMERIC := 0;
+  _tax NUMERIC := 0;
+  _freight NUMERIC := 0;
+  _misc NUMERIC := 0;
+  _amount NUMERIC := 0;
+
+BEGIN
+
+  SELECT COALESCE(SUM(ROUND((coitem_qtyord * coitem_qty_invuomratio) *
+                            (coitem_price / coitem_price_invuomratio), 2)), 0) INTO _subtotal
+  FROM coitem
+  WHERE (coitem_cohead_id=pCoheadid);
+
+  SELECT COALESCE(SUM(tax), 0) INTO _tax
+  FROM ( SELECT ROUND(SUM(taxdetail_tax), 2) AS tax
+         FROM tax JOIN calculateTaxDetailSummary('S', pCoheadid, 'T') ON (taxdetail_tax_id=tax_id)
+         GROUP BY tax_id ) AS data;
+
+  SELECT COALESCE(cohead_freight, 0), COALESCE(cohead_misc, 0) INTO _freight, _misc
+  FROM cohead
+  WHERE (cohead_id=pCoheadid);
+
+  _amount := _subtotal + _tax + _freight + _misc;
+
+  RETURN _amount;
+
+END;
+$$ LANGUAGE 'plpgsql';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7204
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7204&view=rev
Author:   jrogelstad
Date:     2009-10-15 13:28:35 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
issue #9750: Remove errant transaction block that was missing rollback.  No need for this on Misc. Voucher.

Modified Paths:
--------------
    xtuple/trunk/guiclient/miscVoucher.cpp
    xtuple/trunk/guiclient/miscVoucher.h

Modified: xtuple/trunk/guiclient/miscVoucher.cpp
===================================================================
--- xtuple/trunk/guiclient/miscVoucher.cpp	2009-10-15 13:23:07 UTC (rev 7203)
+++ xtuple/trunk/guiclient/miscVoucher.cpp	2009-10-15 13:28:35 UTC (rev 7204)
@@ -41,9 +41,6 @@
 
   _miscDistrib->addColumn(tr("Account"), -1,           Qt::AlignLeft,   true,  "account"  );
   _miscDistrib->addColumn(tr("Amount"),  _moneyColumn, Qt::AlignRight,  true,  "vodist_amount" );
-
-  _inTransaction = TRUE;
-  q.exec("BEGIN;"); //Lot's of things can happen in here that can cause problems if cancelled out.  Let's make it easy to roll it back.
 }
 
 miscVoucher::~miscVoucher()
@@ -243,9 +240,6 @@
 
   _voheadid = -1;
 
-  q.exec("COMMIT;");
-  _inTransaction = false;
-
   if(cNew != _mode)
   {
     close();
@@ -472,10 +466,6 @@
   }
 }
 
-void miscVoucher::clear()
-{
-}
-
 void miscVoucher::closeEvent(QCloseEvent *pEvent)
 {
   if ( (_mode == cNew) && (_voheadid != -1) )
@@ -491,8 +481,6 @@
     q.bindValue(":voucherNumber", _voucherNumber->text().toInt());
     q.exec();
   }
-  else if(_mode == cEdit && _inTransaction)
-  	q.exec("ROLLBACK;");
    
   pEvent->accept();
 }

Modified: xtuple/trunk/guiclient/miscVoucher.h
===================================================================
--- xtuple/trunk/guiclient/miscVoucher.h	2009-10-15 13:23:07 UTC (rev 7203)
+++ xtuple/trunk/guiclient/miscVoucher.h	2009-10-15 13:28:35 UTC (rev 7204)
@@ -38,7 +38,6 @@
     virtual void sPopulateBalanceDue();
     virtual void populateNumber();
     virtual void populate();
-    virtual void clear();
     virtual void closeEvent( QCloseEvent * pEvent );
     virtual void sPopulateDistDate();
     virtual void sPopulateDueDate();
@@ -53,7 +52,6 @@
     int _voheadid;
     double _cachedAmountDistributed;
     int _mode;
-	bool _inTransaction;
 };
 
 #endif // MISCVOUCHER_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7208
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7208&view=rev
Author:   sunsetsolutions
Date:     2009-10-15 19:28:27 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Issue #9591:new Opportunity messages

Modified Paths:
--------------
    xtuple/trunk/common/storedProcErrorLookup.cpp

Modified: xtuple/trunk/common/storedProcErrorLookup.cpp
===================================================================
--- xtuple/trunk/common/storedProcErrorLookup.cpp	2009-10-15 19:27:47 UTC (rev 7207)
+++ xtuple/trunk/common/storedProcErrorLookup.cpp	2009-10-15 19:28:27 UTC (rev 7208)
@@ -516,6 +516,22 @@
                             "delete or reassign these Sales Orders "
                             "before you may delete it."),                      0, "" },
 
+  { "attachQuoteToOpportunity", -1, TR("The selected Quote cannot be attached because "
+                            "the Quote cannot be found."),                     0, "" },
+  { "attachQuoteToOpportunity", -2, TR("The selected Quote cannot be attached because "
+                            "the Opportunity cannot be found."),               0, "" },
+  { "attachQuoteToOpportunity", -3, TR("The selected Quote cannot be attached because "
+                            "it is already associated with an Opportunity.  You must "
+                            "detach this Quote before you may attach it."),    0, "" },
+
+  { "attachSalesOrderToOpportunity", -1, TR("The selected Sales Order cannot be attached because "
+                            "the Sales Order cannot be found."),                     0, "" },
+  { "attachSalesOrderToOpportunity", -2, TR("The selected Sales Order cannot be attached because "
+                            "the Opportunity cannot be found."),               0, "" },
+  { "attachSalesOrderToOpportunity", -3, TR("The selected Sales Order cannot be attached because "
+                            "it is already associated with an Opportunity.  You must "
+                            "detach this Sales Order before you may attach it."),    0, "" },
+
   { "deletePackage", -1, TR("The selected Package cannot be deleted because "
                             "there are other packages that depend on it to "
                             "function properly."),                      0, "" },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7207
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7207&view=rev
Author:   sunsetsolutions
Date:     2009-10-15 19:27:47 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Issue #9591:new quoteList widget

Modified Paths:
--------------
    xtuple/trunk/widgets/widgets.pro

Added Paths:
-----------
    xtuple/trunk/widgets/quoteList.cpp
    xtuple/trunk/widgets/quoteList.h

Added: xtuple/trunk/widgets/quoteList.cpp
===================================================================
--- xtuple/trunk/widgets/quoteList.cpp	                        (rev 0)
+++ xtuple/trunk/widgets/quoteList.cpp	2009-10-15 19:27:47 UTC (rev 7207)
@@ -0,0 +1,144 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+
+#include "quoteList.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+#include <parameter.h>
+
+#include "xtreewidget.h"
+#include "warehousegroup.h"
+#include "quotecluster.h"
+#include "xsqlquery.h"
+
+quoteList::quoteList( QWidget* parent, const char* name, bool modal, Qt::WFlags fl ) : QDialog( parent, name, modal, fl )
+{
+  if ( !name )
+    setObjectName( "quoteList" );
+
+  _quheadid = -1;
+  _custid = -1;
+
+  setWindowTitle(tr("Quotes"));
+
+  QVBoxLayout *mainLayout = new QVBoxLayout(this, 5, 5, "mainLayout"); 
+  QVBoxLayout *warehouseLayout = new QVBoxLayout(0, 0, 0, "warehouseLayout"); 
+  QHBoxLayout *topLayout = new QHBoxLayout( 0, 0, 7, "topLayout"); 
+  QVBoxLayout *buttonsLayout = new QVBoxLayout(0, 0, 5, "buttonsLayout");
+  QVBoxLayout *listLayout = new QVBoxLayout( 0, 0, 0, "listLayout"); 
+
+  _warehouse = new WarehouseGroup(this, "_warehouse");
+  warehouseLayout->addWidget(_warehouse);
+
+  QSpacerItem* spacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Preferred);
+  warehouseLayout->addItem(spacer);
+  topLayout->addLayout(warehouseLayout);
+
+  QSpacerItem* spacer_2 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+  topLayout->addItem(spacer_2);
+
+  _close = new QPushButton(tr("&Cancel"), this, "_close");
+  buttonsLayout->addWidget(_close);
+
+  _select = new QPushButton(tr("&Select"), this, "_select");
+  _select->setEnabled( FALSE );
+  _select->setDefault( TRUE );
+  buttonsLayout->addWidget(_select);
+  buttonsLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
+  topLayout->addLayout(buttonsLayout);
+  mainLayout->addLayout(topLayout);
+
+  QLabel *_quotesLit = new QLabel(tr("Quotes:"), this, "_quotesLit");
+  listLayout->addWidget(_quotesLit);
+
+  _qu = new XTreeWidget(this);
+  _qu->setObjectName("_qu");
+  listLayout->addWidget(_qu, 1);
+  mainLayout->addLayout(listLayout, 1);
+
+  resize( QSize(490, 390).expandedTo(minimumSizeHint()) );
+
+  connect( _close, SIGNAL( clicked() ), this, SLOT( reject() ) );
+  connect( _select, SIGNAL( clicked() ), this, SLOT( sSelect() ) );
+  connect( _qu, SIGNAL( itemSelected(int) ), _select, SLOT( animateClick() ) );
+  connect( _qu, SIGNAL( valid(bool) ), _select, SLOT( setEnabled(bool) ) );
+  connect( _warehouse, SIGNAL(updated()), this, SLOT( sFillList() ) );
+
+  _qu->addColumn(tr("Order #"), _orderColumn, Qt::AlignLeft,  true, "quhead_number");
+  _qu->addColumn(tr("Customer"),          -1, Qt::AlignLeft,  true, "cust_name");
+  _qu->addColumn(tr("Ordered"),  _dateColumn, Qt::AlignCenter,true, "quhead_quotedate");
+  _qu->addColumn(tr("Scheduled"),_dateColumn, Qt::AlignCenter,true, "duedate");
+
+  setTabOrder(_warehouse, _qu);
+  setTabOrder(_qu, _select);
+  setTabOrder(_select, _close);
+  setTabOrder(_close, _warehouse);
+  _warehouse->setFocus();
+}
+
+void quoteList::set(ParameterList &pParams)
+{
+  QVariant param;
+  bool     valid;
+
+  param = pParams.value("quhead_id", &valid);
+  if (valid)
+    _quheadid = param.toInt();
+    
+  param = pParams.value("quoteType", &valid);
+  if (valid)
+    _type = param.toInt();
+    
+  param = pParams.value("cust_id", &valid);
+  if (valid)
+    _custid = param.toInt();
+ 
+  sFillList();
+}
+
+void quoteList::sSelect()
+{
+  done(_qu->id());
+}
+
+void quoteList::sFillList()
+{
+  QString sql;
+
+  sql = "SELECT DISTINCT quhead_id, quhead_number, cust_name, quhead_quotedate,"
+        "                MIN(quitem_scheddate) AS duedate "
+        "FROM quhead, quitem, itemsite, cust "
+        "WHERE ((quhead_cust_id=cust_id)"
+        " AND (quitem_quhead_id=quhead_id)"
+        " AND (quitem_itemsite_id=itemsite_id)";
+
+  if (_warehouse->isSelected())
+    sql += " AND (itemsite_warehous_id=:warehous_id)";
+
+  if (_custid != -1)
+    sql += " AND (quhead_cust_id=:cust_id)";
+
+  sql += ") "
+         "GROUP BY quhead_id, quhead_number, cust_name, quhead_quotedate "
+         "ORDER BY quhead_number;";
+
+  XSqlQuery q;
+  q.prepare(sql);
+  _warehouse->bindValue(q);
+  q.bindValue(":cust_id", _custid);
+  q.exec();
+  _qu->populate(q, _quheadid);
+}

Added: xtuple/trunk/widgets/quoteList.h
===================================================================
--- xtuple/trunk/widgets/quoteList.h	                        (rev 0)
+++ xtuple/trunk/widgets/quoteList.h	2009-10-15 19:27:47 UTC (rev 7207)
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+
+#ifndef quotelist_h
+#define quotelist_h
+
+#include <qdialog.h>
+
+#include "widgets.h"
+
+class WarehouseGroup;
+class QPushButton;
+class XTreeWidget;
+class ParameterList;
+
+class XTUPLEWIDGETS_EXPORT quoteList : public QDialog
+{
+    Q_OBJECT
+
+public:
+    quoteList( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
+
+    WarehouseGroup *_warehouse;
+    QPushButton    *_close;
+    QPushButton    *_select;
+    XTreeWidget      *_qu;
+
+public slots:
+    virtual void set( ParameterList & pParams );
+    virtual void sSelect();
+    virtual void sFillList();
+
+
+private:
+    int _quheadid;
+    int _type;
+    int _custid;
+};
+
+#endif
+

Modified: xtuple/trunk/widgets/widgets.pro
===================================================================
--- xtuple/trunk/widgets/widgets.pro	2009-10-15 17:48:06 UTC (rev 7206)
+++ xtuple/trunk/widgets/widgets.pro	2009-10-15 19:27:47 UTC (rev 7207)
@@ -158,7 +158,7 @@
               alarms.cpp alarmMaint.cpp \
               cmheadcluster.cpp \
               invoiceCluster.cpp \
-              quotecluster.cpp \
+              quotecluster.cpp quoteList.cpp \
               xspinbox.cpp \
               xsqlrelationaldelegate.cpp \
               xtablewidget.cpp \
@@ -214,7 +214,7 @@
               file.h \
               alarms.h alarmMaint.h \
               cmheadcluster.h \
-              quotecluster.h \
+              quotecluster.h quoteList.h \
               invoicecluster.h \
               xspinbox.h \
               xsqlrelationaldelegate.h \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7206
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7206&view=rev
Author:   gilmoskowitz
Date:     2009-10-15 17:48:06 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
issue #8333 - expose more layout classes to scripting,
tweak wocluster to get warehouse id for scripting,
tweak usernamecluster script exposure, and disable some debugging code

Modified Paths:
--------------
    xtuple/trunk/scriptapi/qactionproto.cpp
    xtuple/trunk/scriptapi/qboxlayoutproto.cpp
    xtuple/trunk/scriptapi/qgridlayoutproto.cpp
    xtuple/trunk/scriptapi/qtexteditproto.cpp
    xtuple/trunk/scriptapi/scriptapi.pro
    xtuple/trunk/scriptapi/setupscriptapi.cpp
    xtuple/trunk/widgets/usernameCluster.cpp
    xtuple/trunk/widgets/usernamecluster.h
    xtuple/trunk/widgets/woCluster.cpp
    xtuple/trunk/widgets/wocluster.h

Added Paths:
-----------
    xtuple/trunk/scriptapi/qlayoutitemproto.cpp
    xtuple/trunk/scriptapi/qlayoutitemproto.h
    xtuple/trunk/scriptapi/qsizepolicyproto.cpp
    xtuple/trunk/scriptapi/qsizepolicyproto.h
    xtuple/trunk/scriptapi/qspaceritemproto.cpp
    xtuple/trunk/scriptapi/qspaceritemproto.h

Removed Paths:
-------------
    xtuple/trunk/scriptapi/usernamelineeditsetup.cpp
    xtuple/trunk/scriptapi/usernamelineeditsetup.h

Modified: xtuple/trunk/scriptapi/qactionproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qactionproto.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/qactionproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -15,7 +15,7 @@
 #include <QIcon>
 #include <QString>
 
-#define DEBUG true
+#define DEBUG false
 
 QScriptValue QActiontoScriptValue(QScriptEngine *engine, QAction* const &item)
 {

Modified: xtuple/trunk/scriptapi/qboxlayoutproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qboxlayoutproto.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/qboxlayoutproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -14,7 +14,7 @@
 #include <QWidget>
 #include <QtScript>
 
-#define DEBUG true
+#define DEBUG false
 
 QScriptValue QBoxLayouttoScriptValue(QScriptEngine *engine, QBoxLayout* const &item)
 {

Modified: xtuple/trunk/scriptapi/qgridlayoutproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qgridlayoutproto.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/qgridlayoutproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -13,7 +13,7 @@
 #include <QString>
 #include <QWidget>
 
-#define DEBUG true
+#define DEBUG false
 
 QScriptValue QGridLayouttoScriptValue(QScriptEngine *engine, QGridLayout* const &item)
 {
@@ -66,6 +66,9 @@
 void QGridLayoutProto::addItem(QLayoutItem *item, int row, int column, int rowspan, int columnSpan, Qt::Alignment alignment)
 {
   QGridLayout *griditem = qscriptvalue_cast<QGridLayout*>(thisObject());
+  if (DEBUG)
+    qDebug("QGridLayoutProto(%p, %d, %d, %d, %d, %d) called",
+           item, row, column, rowspan, columnSpan, (int)alignment);
   if (griditem)
     griditem->addItem(item, row, column, rowspan, columnSpan, alignment);
 }

Added: xtuple/trunk/scriptapi/qlayoutitemproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qlayoutitemproto.cpp	                        (rev 0)
+++ xtuple/trunk/scriptapi/qlayoutitemproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,173 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#include "qlayoutitemproto.h"
+#include "qspaceritemproto.h"
+
+#define DEBUG false
+
+QScriptValue QLayoutItemtoScriptValue(QScriptEngine *engine, QLayoutItem* const &item)
+{
+  if (DEBUG) qDebug("QLayoutItemtoScriptValue(%p, %p) called", engine, item);
+  QScriptValue result = engine->newObject();
+  result.setData(engine->newVariant(qVariantFromValue(item)));
+  return result;
+}
+
+// TODO: why must we check for all possible value<> castings? this is fragile
+void QLayoutItemfromScriptValue(const QScriptValue &obj, QLayoutItem* &item)
+{
+  if (DEBUG) qDebug("QLayoutItemfromScriptValue(obj, %p) called", item);
+  item = obj.data().toVariant().value<QLayoutItem*>();
+  if (! item)
+    item = obj.data().toVariant().value<QSpacerItem*>();
+  if (DEBUG) qDebug("QLayoutItemfromScriptValue set %p", item);
+}
+
+void setupQLayoutItemProto(QScriptEngine *engine)
+{
+  qScriptRegisterMetaType(engine, QLayoutItemtoScriptValue, QLayoutItemfromScriptValue);
+
+  QScriptValue proto = engine->newQObject(new QLayoutItemProto(engine));
+  engine->setDefaultPrototype(qMetaTypeId<QLayoutItem*>(), proto);
+  if (DEBUG)
+    qDebug("setupQLayoutItemProto() returning");
+}
+
+QLayoutItemProto::QLayoutItemProto(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Qt::Alignment QLayoutItemProto::alignment() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->alignment();
+  return (Qt::Alignment)0;
+}
+
+Qt::Orientations QLayoutItemProto::expandingDirections() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->expandingDirections();
+  return (Qt::Orientations)0;
+}
+
+QRect QLayoutItemProto::geometry() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->geometry();
+  return QRect();
+}
+
+bool QLayoutItemProto::hasHeightForWidth() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->hasHeightForWidth();
+  return false;
+}
+
+int QLayoutItemProto::heightForWidth(int w) const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->heightForWidth(w);
+  return 0;
+}
+
+void QLayoutItemProto::invalidate()
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    item->invalidate();
+}
+
+bool QLayoutItemProto::isEmpty() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->isEmpty();
+  return false;
+}
+
+QLayout *QLayoutItemProto::layout()
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->layout();
+  return 0;
+}
+
+QSize QLayoutItemProto::maximumSize() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->maximumSize();
+  return QSize();
+}
+
+int QLayoutItemProto::minimumHeightForWidth(int w) const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->minimumHeightForWidth(w);
+  return 0;
+}
+
+QSize QLayoutItemProto::minimumSize() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->minimumSize();
+  return QSize();
+}
+
+void QLayoutItemProto::setAlignment(Qt::Alignment alignment)
+{
+  if (DEBUG) qDebug("QLayoutItemProto::setAlignment(%d)", (int)alignment);
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    item->setAlignment(alignment);
+}
+
+void QLayoutItemProto::setGeometry(const QRect &r)
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    item->setGeometry(r);
+}
+
+QSize QLayoutItemProto::sizeHint() const
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->sizeHint();
+  return QSize();
+}
+
+QSpacerItem *QLayoutItemProto::spacerItem()
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->spacerItem();
+  return 0;
+}
+
+QWidget *QLayoutItemProto::widget()
+{
+  QLayoutItem *item = qscriptvalue_cast<QLayoutItem*>(thisObject());
+  if (item)
+    return item->widget();
+  return 0;
+}

Added: xtuple/trunk/scriptapi/qlayoutitemproto.h
===================================================================
--- xtuple/trunk/scriptapi/qlayoutitemproto.h	                        (rev 0)
+++ xtuple/trunk/scriptapi/qlayoutitemproto.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#ifndef __QLAYOUTITEMPROTO_H__
+#define __QLAYOUTITEMPROTO_H__
+
+#include <QLayoutItem>
+#include <QObject>
+#include <QtScript>
+
+class QString;
+
+Q_DECLARE_METATYPE(QLayoutItem*)
+
+void setupQLayoutItemProto(QScriptEngine *engine);
+QScriptValue constructQLayoutItem(QScriptContext *context, QScriptEngine *engine);
+
+class QLayoutItemProto : public QObject, public QScriptable
+{
+  Q_OBJECT
+
+  public:
+    QLayoutItemProto(QObject *parent);
+
+    Q_INVOKABLE Qt::Alignment    alignment() const;
+    QSizePolicy::ControlTypes    controlTypes ()                const;
+    Q_INVOKABLE Qt::Orientations expandingDirections()          const;
+    Q_INVOKABLE QRect            geometry()                     const;
+    Q_INVOKABLE bool             hasHeightForWidth()            const;
+    Q_INVOKABLE int              heightForWidth(int w)          const;
+    Q_INVOKABLE void             invalidate();
+    Q_INVOKABLE bool             isEmpty()                      const;
+    Q_INVOKABLE QLayout         *layout();
+    Q_INVOKABLE QSize            maximumSize()                  const;
+    Q_INVOKABLE int              minimumHeightForWidth(int w)   const;
+    Q_INVOKABLE QSize            minimumSize()                  const;
+    Q_INVOKABLE void             setAlignment(Qt::Alignment alignment);
+    Q_INVOKABLE void             setGeometry(const QRect &r);
+    Q_INVOKABLE QSize            sizeHint()                     const;
+    Q_INVOKABLE QSpacerItem     *spacerItem();
+    Q_INVOKABLE QWidget         *widget();
+};
+
+#endif

Added: xtuple/trunk/scriptapi/qsizepolicyproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qsizepolicyproto.cpp	                        (rev 0)
+++ xtuple/trunk/scriptapi/qsizepolicyproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#include "qsizepolicyproto.h"
+
+QScriptValue QSizePolicyControlTypetoScriptValue(QScriptEngine *engine, const enum QSizePolicy::ControlType &p)
+{ return QScriptValue(engine, (int)p); }
+
+void QSizePolicyControlTypefromScriptValue(const QScriptValue &obj, enum QSizePolicy::ControlType &p)
+{ p = (enum QSizePolicy::ControlType)obj.toInt32(); }
+
+QScriptValue QSizePolicyPolicytoScriptValue(QScriptEngine *engine, const enum QSizePolicy::Policy &p)
+{ return QScriptValue(engine, (int)p); }
+
+void QSizePolicyPolicyfromScriptValue(const QScriptValue &obj, enum QSizePolicy::Policy &p)
+{ p = (enum QSizePolicy::Policy)obj.toInt32(); }
+
+QScriptValue QSizePolicyPolicyFlagtoScriptValue(QScriptEngine *engine, const enum QSizePolicy::PolicyFlag &p)
+{ return QScriptValue(engine, (int)p); }
+
+void QSizePolicyPolicyFlagfromScriptValue(const QScriptValue &obj, enum QSizePolicy::PolicyFlag &p)
+{ p = (enum QSizePolicy::PolicyFlag)obj.toInt32(); }
+
+void setupQSizePolicy(QScriptEngine *engine)
+{
+  QScriptValue proto = engine->newObject();
+
+  //enum ControlType
+  proto.setProperty("DefaultType", QSizePolicy::DefaultType);
+  proto.setProperty("ButtonBox",   QSizePolicy::ButtonBox);
+  proto.setProperty("CheckBox",    QSizePolicy::CheckBox);
+  proto.setProperty("ComboBox",    QSizePolicy::ComboBox);
+  proto.setProperty("Frame",       QSizePolicy::Frame);
+  proto.setProperty("GroupBox",    QSizePolicy::GroupBox);
+  proto.setProperty("Label",       QSizePolicy::Label);
+  proto.setProperty("Line",        QSizePolicy::Line);
+  proto.setProperty("LineEdit",    QSizePolicy::LineEdit);
+  proto.setProperty("PushButton",  QSizePolicy::PushButton);
+  proto.setProperty("RadioButton", QSizePolicy::RadioButton);
+  proto.setProperty("Slider",      QSizePolicy::Slider);
+  proto.setProperty("SpinBox",     QSizePolicy::SpinBox);
+  proto.setProperty("TabWidget",   QSizePolicy::TabWidget);
+  proto.setProperty("ToolButton",  QSizePolicy::ToolButton);
+
+  //enum Policy
+  proto.setProperty("Fixed",           QSizePolicy::Fixed);
+  proto.setProperty("Minimum",         QSizePolicy::Minimum);
+  proto.setProperty("Maximum",         QSizePolicy::Maximum);
+  proto.setProperty("Preferred",       QSizePolicy::Preferred);
+  proto.setProperty("Expanding",       QSizePolicy::Expanding);
+  proto.setProperty("MinimumExpanding",QSizePolicy::MinimumExpanding);
+  proto.setProperty("Ignored",         QSizePolicy::Ignored);
+
+  // enum PolicyFlag
+  proto.setProperty("GrowFlag",   QSizePolicy::GrowFlag);
+  proto.setProperty("ExpandFlag", QSizePolicy::ExpandFlag);
+  proto.setProperty("ShrinkFlag", QSizePolicy::ShrinkFlag);
+  proto.setProperty("IgnoreFlag", QSizePolicy::IgnoreFlag);
+
+  engine->globalObject().setProperty("QSizePolicy", proto);
+}

Added: xtuple/trunk/scriptapi/qsizepolicyproto.h
===================================================================
--- xtuple/trunk/scriptapi/qsizepolicyproto.h	                        (rev 0)
+++ xtuple/trunk/scriptapi/qsizepolicyproto.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#ifndef __QSIZEPOLICYPROTO_H__
+#define __QSIZEPOLICYPROTO_H__
+
+#include <QSizePolicy>
+#include <QObject>
+#include <QtScript>
+
+Q_DECLARE_METATYPE(enum QSizePolicy::ControlType)
+Q_DECLARE_METATYPE(enum QSizePolicy::Policy)
+Q_DECLARE_METATYPE(enum QSizePolicy::PolicyFlag)
+
+void setupQSizePolicy(QScriptEngine *engine);
+
+#endif

Added: xtuple/trunk/scriptapi/qspaceritemproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qspaceritemproto.cpp	                        (rev 0)
+++ xtuple/trunk/scriptapi/qspaceritemproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,220 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#include "qspaceritemproto.h"
+
+#include "qsizepolicyproto.h"
+
+#define DEBUG false
+
+QScriptValue QSpacerItemtoScriptValue(QScriptEngine *engine, QSpacerItem* const &item)
+{
+  if (DEBUG) qDebug("QSpacerItemtoScriptValue(%p, %p) called", engine, item);
+  QScriptValue result = engine->newObject();
+  result.setData(engine->newVariant(qVariantFromValue(item)));
+  return result;
+}
+
+void QSpacerItemfromScriptValue(const QScriptValue &obj, QSpacerItem* &item)
+{
+  if (DEBUG) qDebug("QSpacerItemfromScriptValue(obj, %p) called", item);
+  item = obj.data().toVariant().value<QSpacerItem*>();
+  if (DEBUG) qDebug("QSpacerItemfromScriptValue set %p", item);
+}
+
+void setupQSpacerItem(QScriptEngine *engine)
+{
+  qScriptRegisterMetaType(engine, QSpacerItemtoScriptValue, QSpacerItemfromScriptValue);
+
+  QScriptValue proto = engine->newQObject(new QSpacerItemProto(engine));
+  engine->setDefaultPrototype(qMetaTypeId<QSpacerItem*>(), proto);
+
+  QScriptValue constructor = engine->newFunction(constructQSpacerItem, proto);
+  engine->globalObject().setProperty("QSpacerItem", constructor);
+}
+
+QScriptValue constructQSpacerItem(QScriptContext *context,
+                                  QScriptEngine  *engine)
+{
+  if (DEBUG)
+    qDebug("constructQSpacerItem() called with %d args",
+           context->argumentCount());
+  QSpacerItem *obj = 0;
+
+  if (context->argumentCount() == 2 &&
+      context->argument(0).isNumber() &&
+      context->argument(1).isNumber())
+    obj = new QSpacerItem(context->argument(0).toInt32(),
+                          context->argument(1).toInt32());
+
+  else if (context->argumentCount() == 3 &&
+           context->argument(0).isNumber() &&
+           context->argument(1).isNumber() &&
+           context->argument(2).isNumber())
+    obj = new QSpacerItem(context->argument(0).toInt32(),
+                          context->argument(1).toInt32(),
+                          qscriptvalue_cast<QSizePolicy::Policy>(context->argument(2)));
+
+  else if (context->argumentCount() == 4 &&
+           context->argument(0).isNumber() &&
+           context->argument(1).isNumber() &&
+           context->argument(2).isNumber() &&
+           context->argument(3).isNumber())
+    obj = new QSpacerItem(context->argument(0).toInt32(),
+                          context->argument(1).toInt32(),
+                          qscriptvalue_cast<QSizePolicy::Policy>(context->argument(2)),
+                          qscriptvalue_cast<QSizePolicy::Policy>(context->argument(3)));
+
+  else
+    context->throwError(QScriptContext::UnknownError,
+                        "could not find appropriate QSpacerItem constructor");
+
+  if (DEBUG)
+    qDebug("constructQSpacerItem() returning %p", obj);
+  return engine->toScriptValue(obj);
+}
+
+QSpacerItemProto::QSpacerItemProto(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Qt::Alignment QSpacerItemProto::alignment() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->alignment();
+  return (Qt::Alignment)0;
+}
+
+void QSpacerItemProto::changeSize(int w, int h, QSizePolicy::Policy hPolicy, QSizePolicy::Policy vPolicy)
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    item->changeSize(w, h, hPolicy, vPolicy);
+}
+
+Qt::Orientations QSpacerItemProto::expandingDirections() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->expandingDirections();
+  return (Qt::Orientations)0;
+}
+
+QRect QSpacerItemProto::geometry() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->geometry();
+  return QRect();
+}
+
+bool QSpacerItemProto::hasHeightForWidth() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->hasHeightForWidth();
+  return false;
+}
+
+int QSpacerItemProto::heightForWidth(int w) const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->heightForWidth(w);
+  return 0;
+}
+
+void QSpacerItemProto::invalidate()
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    item->invalidate();
+}
+
+bool QSpacerItemProto::isEmpty() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->isEmpty();
+  return false;
+}
+
+QLayout *QSpacerItemProto::layout()
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->layout();
+  return 0;
+}
+
+QSize QSpacerItemProto::maximumSize() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->maximumSize();
+  return QSize();
+}
+
+int QSpacerItemProto::minimumHeightForWidth(int w) const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->minimumHeightForWidth(w);
+  return 0;
+}
+
+QSize QSpacerItemProto::minimumSize() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->minimumSize();
+  return QSize();
+}
+
+void QSpacerItemProto::setAlignment(Qt::Alignment alignment)
+{
+  if (DEBUG) qDebug("QSpacerItemProto::setAlignment(%d)", (int)alignment);
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    item->setAlignment(alignment);
+}
+
+void QSpacerItemProto::setGeometry(const QRect &r)
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    item->setGeometry(r);
+}
+
+QSize QSpacerItemProto::sizeHint() const
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->sizeHint();
+  return QSize();
+}
+
+QSpacerItem *QSpacerItemProto::spacerItem()
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->spacerItem();
+  return 0;
+}
+
+QWidget *QSpacerItemProto::widget()
+{
+  QSpacerItem *item = qscriptvalue_cast<QSpacerItem*>(thisObject());
+  if (item)
+    return item->widget();
+  return 0;
+}

Added: xtuple/trunk/scriptapi/qspaceritemproto.h
===================================================================
--- xtuple/trunk/scriptapi/qspaceritemproto.h	                        (rev 0)
+++ xtuple/trunk/scriptapi/qspaceritemproto.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the xTuple ERP: PostBooks Edition, a free and
+ * open source Enterprise Resource Planning software suite,
+ * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
+ * It is licensed to you under the Common Public Attribution License
+ * version 1.0, the full text of which (including xTuple-specific Exhibits)
+ * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
+ * to be bound by its terms.
+ */
+
+#ifndef __QSPACERITEMPROTO_H__
+#define __QSPACERITEMPROTO_H__
+
+#include <QSpacerItem>
+#include <QObject>
+#include <QtScript>
+
+class QString;
+
+Q_DECLARE_METATYPE(QSpacerItem*)
+
+void setupQSpacerItem(QScriptEngine *engine);
+QScriptValue constructQSpacerItem(QScriptContext *context, QScriptEngine *engine);
+
+class QSpacerItemProto : public QObject, public QScriptable
+{
+  Q_OBJECT
+
+  public:
+    QSpacerItemProto(QObject *parent);
+
+    Q_INVOKABLE Qt::Alignment    alignment() const;
+    Q_INVOKABLE void             changeSize(int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum);
+    QSizePolicy::ControlTypes    controlTypes ()                const;
+    Q_INVOKABLE Qt::Orientations expandingDirections()          const;
+    Q_INVOKABLE QRect            geometry()                     const;
+    Q_INVOKABLE bool             hasHeightForWidth()            const;
+    Q_INVOKABLE int              heightForWidth(int w)          const;
+    Q_INVOKABLE void             invalidate();
+    Q_INVOKABLE bool             isEmpty()                      const;
+    Q_INVOKABLE QLayout         *layout();
+    Q_INVOKABLE QSize            maximumSize()                  const;
+    Q_INVOKABLE int              minimumHeightForWidth(int w)   const;
+    Q_INVOKABLE QSize            minimumSize()                  const;
+    Q_INVOKABLE void             setAlignment(Qt::Alignment alignment);
+    Q_INVOKABLE void             setGeometry(const QRect &r);
+    Q_INVOKABLE QSize            sizeHint()                     const;
+    Q_INVOKABLE QSpacerItem     *spacerItem();
+    Q_INVOKABLE QWidget         *widget();
+};
+
+#endif

Modified: xtuple/trunk/scriptapi/qtexteditproto.cpp
===================================================================
--- xtuple/trunk/scriptapi/qtexteditproto.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/qtexteditproto.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -12,7 +12,7 @@
 
 #include <QString>
 
-#define DEBUG true
+#define DEBUG false
 
 void setupQTextEditProto(QScriptEngine *engine)
 {

Modified: xtuple/trunk/scriptapi/scriptapi.pro
===================================================================
--- xtuple/trunk/scriptapi/scriptapi.pro	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/scriptapi.pro	2009-10-15 17:48:06 UTC (rev 7206)
@@ -47,11 +47,14 @@
             qgridlayoutproto.h                  \
             qiconproto.h                        \
             qlayoutproto.h                      \
+            qlayoutitemproto.h                  \
             qmenuproto.h                        \
             qmessageboxsetup.h                  \
             qnetworkreplyproto.h                \
             qnetworkrequestproto.h              \
             qprinterproto.h                     \
+            qsizepolicyproto.h                  \
+            qspaceritemproto.h                  \
             qsqldatabaseproto.h                 \
             qsqlerrorproto.h                    \
             qsqlrecordproto.h                   \
@@ -90,7 +93,6 @@
             shipmentclusterlineeditsetup.h	\
             solineeditsetup.h			\
             tolineeditsetup.h			\
-            usernamelineeditsetup.h		\
             vendorgroupsetup.h			\
             wcomboboxsetup.h			\
             womatlclustersetup.h		\
@@ -126,12 +128,15 @@
             qfontproto.cpp                      \
             qgridlayoutproto.cpp                \
             qiconproto.cpp                      \
+            qlayoutitemproto.cpp                \
             qlayoutproto.cpp                    \
             qmenuproto.cpp                      \
             qmessageboxsetup.cpp                \
             qnetworkreplyproto.cpp              \
             qnetworkrequestproto.cpp            \
             qprinterproto.cpp                   \
+            qsizepolicyproto.cpp                \
+            qspaceritemproto.cpp                \
             qsqldatabaseproto.cpp               \
             qsqlerrorproto.cpp                  \
             qsqlrecordproto.cpp                 \
@@ -170,7 +175,6 @@
             shipmentclusterlineeditsetup.cpp	\
             solineeditsetup.cpp			\
             tolineeditsetup.cpp			\
-            usernamelineeditsetup.cpp		\
             vendorgroupsetup.cpp		\
             wcomboboxsetup.cpp			\
             womatlclustersetup.cpp		\

Modified: xtuple/trunk/scriptapi/setupscriptapi.cpp
===================================================================
--- xtuple/trunk/scriptapi/setupscriptapi.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/setupscriptapi.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -52,12 +52,15 @@
 #include "qfontproto.h"
 #include "qgridlayoutproto.h"
 #include "qiconproto.h"
+#include "qlayoutitemproto.h"
 #include "qlayoutproto.h"
 #include "qmenuproto.h"
 #include "qmessageboxsetup.h"
 #include "qnetworkreplyproto.h"
 #include "qnetworkrequestproto.h"
 #include "qprinterproto.h"
+#include "qsizepolicyproto.h"
+#include "qspaceritemproto.h"
 #include "qsqldatabaseproto.h"
 #include "qsqlerrorproto.h"
 #include "qsqlrecordproto.h"
@@ -79,7 +82,7 @@
 #include "shipmentclusterlineeditsetup.h"
 #include "solineeditsetup.h"
 #include "tolineeditsetup.h"
-#include "usernamelineeditsetup.h"
+#include "usernamecluster.h"
 #include "vendorgroupsetup.h"
 #include "wcomboboxsetup.h"
 #include "wocluster.h"
@@ -139,6 +142,7 @@
   setupQFontProto(engine);
   setupQGridLayoutProto(engine);
   setupQIconProto(engine);
+  setupQLayoutItemProto(engine);
   setupQLayoutProto(engine);
   setupQMenuProto(engine);
   setupQMessageBox(engine);
@@ -146,6 +150,8 @@
   setupQNetworkReplyProto(engine);
   setupQNetworkRequestProto(engine);
   setupQPrinterProto(engine);
+  setupQSizePolicy(engine);
+  setupQSpacerItem(engine);
   setupQSqlDatabaseProto(engine);
   setupQSqlErrorProto(engine);
   setupQSqlRecordProto(engine);
@@ -166,6 +172,7 @@
   setupShipmentClusterLineEdit(engine);
   setupSoLineEdit(engine);
   setupToLineEdit(engine);
+  setupUsernameCluster(engine);
   setupUsernameLineEdit(engine);
   setupVendorGroup(engine);
   setupWComboBox(engine);

Deleted: xtuple/trunk/scriptapi/usernamelineeditsetup.cpp
===================================================================
--- xtuple/trunk/scriptapi/usernamelineeditsetup.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/usernamelineeditsetup.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -1,23 +0,0 @@
-/*
- * This file is part of the xTuple ERP: PostBooks Edition, a free and
- * open source Enterprise Resource Planning software suite,
- * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
- * It is licensed to you under the Common Public Attribution License
- * version 1.0, the full text of which (including xTuple-specific Exhibits)
- * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
- * to be bound by its terms.
- */
-
-#include "usernamecluster.h"
-#include <QtScript>
-
-void setupUsernameLineEdit(QScriptEngine *engine)
-{
-  QScriptValue widget = engine->newObject();
-
-  widget.setProperty("UsersAll",     QScriptValue(engine, UsernameLineEdit::UsersAll),     QScriptValue::ReadOnly | QScriptValue::Undeletable);
-  widget.setProperty("UsersActive",  QScriptValue(engine, UsernameLineEdit::UsersActive),  QScriptValue::ReadOnly | QScriptValue::Undeletable);
-  widget.setProperty("UsersInactive",QScriptValue(engine, UsernameLineEdit::UsersInactive),QScriptValue::ReadOnly | QScriptValue::Undeletable);
-
-  engine->globalObject().setProperty("UsernameLineEdit", widget, QScriptValue::ReadOnly | QScriptValue::Undeletable);
-}

Deleted: xtuple/trunk/scriptapi/usernamelineeditsetup.h
===================================================================
--- xtuple/trunk/scriptapi/usernamelineeditsetup.h	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/scriptapi/usernamelineeditsetup.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -1,16 +0,0 @@
-/*
- * This file is part of the xTuple ERP: PostBooks Edition, a free and
- * open source Enterprise Resource Planning software suite,
- * Copyright (c) 1999-2009 by OpenMFG LLC, d/b/a xTuple.
- * It is licensed to you under the Common Public Attribution License
- * version 1.0, the full text of which (including xTuple-specific Exhibits)
- * is available at http://www.xtuple.com/CPAL.  By using this software, you agree
- * to be bound by its terms.
- */
-
-#ifndef __USERNAMELINEEDITSETUP_H__
-#define __USERNAMELINEEDITSETUP_H__
-
-void setupUsernameLineEdit(QScriptEngine *engine);
-
-#endif

Modified: xtuple/trunk/widgets/usernameCluster.cpp
===================================================================
--- xtuple/trunk/widgets/usernameCluster.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/widgets/usernameCluster.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -10,8 +10,8 @@
 
 #include <QPushButton>
 #include <QLabel>
-#include <QValidator>
 #include <QHBoxLayout>
+#include <QtScript>
 
 #include <parameter.h>
 #include <xsqlquery.h>
@@ -184,3 +184,88 @@
   _username->setUsername(pUsername);
 }
 
+// script exposure ////////////////////////////////////////////////////////////
+
+QScriptValue UsernameLineEdittoScriptValue(QScriptEngine *engine, UsernameLineEdit* const &item)
+{
+  return engine->newQObject(item);
+}
+
+void UsernameLineEditfromScriptValue(const QScriptValue &obj, UsernameLineEdit* &item)
+{
+  item = qobject_cast<UsernameLineEdit*>(obj.toQObject());
+}
+
+QScriptValue constructUsernameLineEdit(QScriptContext *context,
+                                       QScriptEngine  *engine)
+{
+  UsernameLineEdit *obj = 0;
+
+  if (context->argumentCount() == 1 &&
+      qscriptvalue_cast<QWidget*>(context->argument(0)))
+    obj = new UsernameLineEdit(qscriptvalue_cast<QWidget*>(context->argument(0)));
+
+  else if (context->argumentCount() >= 2 &&
+      qscriptvalue_cast<QWidget*>(context->argument(0)))
+    obj = new UsernameLineEdit(qscriptvalue_cast<QWidget*>(context->argument(0)),
+                               qPrintable(context->argument(1).toString()));
+
+  else
+    context->throwError(QScriptContext::UnknownError,
+                        "could not find an appropriate UsernameLineEdit constructor");
+
+  return engine->toScriptValue(obj);
+}
+
+void setupUsernameLineEdit(QScriptEngine *engine)
+{
+  qScriptRegisterMetaType(engine, UsernameLineEdittoScriptValue, UsernameLineEditfromScriptValue);
+
+  QScriptValue widget = engine->newFunction(constructUsernameLineEdit);
+
+  widget.setProperty("UsersAll",     QScriptValue(engine, UsernameLineEdit::UsersAll),     QScriptValue::ReadOnly | QScriptValue::Undeletable);
+  widget.setProperty("UsersActive",  QScriptValue(engine, UsernameLineEdit::UsersActive),  QScriptValue::ReadOnly | QScriptValue::Undeletable);
+  widget.setProperty("UsersInactive",QScriptValue(engine, UsernameLineEdit::UsersInactive),QScriptValue::ReadOnly | QScriptValue::Undeletable);
+
+  engine->globalObject().setProperty("UsernameLineEdit", widget, QScriptValue::ReadOnly | QScriptValue::Undeletable);
+}
+
+QScriptValue UsernameClustertoScriptValue(QScriptEngine *engine, UsernameCluster* const &item)
+{
+  return engine->newQObject(item);
+}
+
+void UsernameClusterfromScriptValue(const QScriptValue &obj, UsernameCluster* &item)
+{
+  item = qobject_cast<UsernameCluster*>(obj.toQObject());
+}
+
+QScriptValue constructUsernameCluster(QScriptContext *context,
+                                       QScriptEngine  *engine)
+{
+  UsernameCluster *obj = 0;
+
+  if (context->argumentCount() == 1 &&
+      qscriptvalue_cast<QWidget*>(context->argument(0)))
+    obj = new UsernameCluster(qscriptvalue_cast<QWidget*>(context->argument(0)));
+
+  else if (context->argumentCount() >= 2 &&
+      qscriptvalue_cast<QWidget*>(context->argument(0)))
+    obj = new UsernameCluster(qscriptvalue_cast<QWidget*>(context->argument(0)),
+                               qPrintable(context->argument(1).toString()));
+
+  else
+    context->throwError(QScriptContext::UnknownError,
+                        "could not find an appropriate UsernameCluster constructor");
+
+  return engine->toScriptValue(obj);
+}
+
+void setupUsernameCluster(QScriptEngine *engine)
+{
+  qScriptRegisterMetaType(engine, UsernameClustertoScriptValue, UsernameClusterfromScriptValue);
+
+  QScriptValue widget = engine->newFunction(constructUsernameCluster);
+
+  engine->globalObject().setProperty("UsernameCluster", widget, QScriptValue::ReadOnly | QScriptValue::Undeletable);
+}

Modified: xtuple/trunk/widgets/usernamecluster.h
===================================================================
--- xtuple/trunk/widgets/usernamecluster.h	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/widgets/usernamecluster.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -17,9 +17,13 @@
 
 class QLabel;
 class QPushButton;
+class QScriptEngine;
 
 class UsernameCluster;
 
+void setupUsernameLineEdit(QScriptEngine *engine);
+void setupUsernameCluster(QScriptEngine *engine);
+
 class XTUPLEWIDGETS_EXPORT UsernameLineEdit : public XLineEdit
 {
   Q_OBJECT
@@ -35,11 +39,11 @@
       UsersInactive
     };
 
-    inline enum Type type() const { return _type; }
-    inline void setType(enum Type pType) { _type = pType; }
+    Q_INVOKABLE inline enum Type type() const { return _type; }
+    Q_INVOKABLE inline void setType(enum Type pType) { _type = pType; }
 
-    int id();
-    const QString & username();
+    Q_INVOKABLE int id();
+    Q_INVOKABLE const QString & username();
 
   public slots:
     void setId(int);
@@ -94,5 +98,7 @@
     QLabel           * _label;
 };
 
+Q_DECLARE_METATYPE(UsernameLineEdit*)
+Q_DECLARE_METATYPE(UsernameCluster*)
+
 #endif
-

Modified: xtuple/trunk/widgets/woCluster.cpp
===================================================================
--- xtuple/trunk/widgets/woCluster.cpp	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/widgets/woCluster.cpp	2009-10-15 17:48:06 UTC (rev 7206)
@@ -45,6 +45,7 @@
 {
   _woType = 0;
   _warehouseid = -1;
+  _currentWarehouseid = -1;
   _parsed = TRUE;
   _useQuery = FALSE;
 
@@ -86,6 +87,7 @@
     else
     {
       wo.prepare( "SELECT formatWONumber(wo_id) AS wonumber,"
+                  "       warehous_id,"
                   "       warehous_code, item_id, item_number, uom_name,"
                   "       item_descrip1, item_descrip2,"
                   "       abs(wo_qtyord) AS wo_qtyord,"
@@ -109,7 +111,7 @@
                   "       ELSE "
                   "         'D' "
                   "       END AS method "
-                  "FROM wo, itemsite, item, warehous, uom "
+                  "FROM wo, itemsite, item, whsinfo, uom "
                   "WHERE ((wo_itemsite_id=itemsite_id)"
                   " AND (itemsite_item_id=item_id)"
                   " AND (item_inv_uom_id=uom_id)"
@@ -136,6 +138,8 @@
       _qtyOrdered  = wo.value("wo_qtyord").toDouble();
       _qtyReceived = wo.value("wo_qtyrcv").toDouble();
       _method = wo.value("method").toString();
+      _currentWarehouseid = (wo.value("warehous_id").isNull())
+                                      ? -1 : wo.value("warehous_id").toInt();
 
       emit newId(_id);
       emit newItemid(wo.value("item_id").toInt());
@@ -158,6 +162,7 @@
   {
     _id    = -1;
     _valid = FALSE;
+    _currentWarehouseid = -1;
 
     setText("");
 
@@ -895,4 +900,3 @@
 {
   m->addMapping(_itemNumber, _fieldName, "code", "currentDefault");
 }
-

Modified: xtuple/trunk/widgets/wocluster.h
===================================================================
--- xtuple/trunk/widgets/wocluster.h	2009-10-15 16:56:25 UTC (rev 7205)
+++ xtuple/trunk/widgets/wocluster.h	2009-10-15 17:48:06 UTC (rev 7206)
@@ -57,17 +57,20 @@
       Closed    = 0x10
     };
 
-    inline void setQuery(const QString  &pSql) { _sql = pSql; _useQuery = TRUE; }
-    inline int  type() const                   { return _woType;              }
-    inline void setType(int pWoType)           { _woType = pWoType;           }
-    inline void setWarehouse(int pWarehouseid) { _warehouseid = pWarehouseid; }
-    inline QString method() const                 { return _method;              }
+    Q_INVOKABLE inline int     currentWarehouse() const       { return _currentWarehouseid;  }
+    Q_INVOKABLE inline QString method() const                 { return _method;              }
+    Q_INVOKABLE inline void    setQuery(const QString  &pSql) { _sql = pSql; _useQuery = TRUE; }
+    Q_INVOKABLE inline void    setType(int pWoType)           { _woType = pWoType;           }
+    Q_INVOKABLE inline void    setWarehouse(int pWarehouseid) { _warehouseid = pWarehouseid; }
+    Q_INVOKABLE inline int     type() const                   { return _woType;              }
+    Q_INVOKABLE inline int     warehouse() const              { return _warehouseid;         }
 
   public slots:
     void setId(int);
     void sParse();
 
   private:
+    int     _currentWarehouseid;
     bool    _useQuery;
     QString _sql;
     int     _woType;
@@ -116,10 +119,11 @@
     inline void setType(int pWoType)           { _woNumber->_woType = pWoType;           }
     inline int  type() const                   { return _woNumber->_woType;              }
     inline void setWarehouse(int pWarehouseid) { _woNumber->_warehouseid = pWarehouseid; }
+    Q_INVOKABLE inline int currentWarehouse() const { return _woNumber->currentWarehouse(); }
     Q_INVOKABLE inline int id() const          { return _woNumber->_id;                  }
     Q_INVOKABLE inline bool isValid() const    { return _woNumber->_valid;               }
     Q_INVOKABLE inline char status() const     { return _woNumber->_status.toAscii();    }
-    Q_INVOKABLE inline QString method() const     { return _woNumber->method();             }
+    Q_INVOKABLE inline QString method() const     { return _woNumber->method();          }
     Q_INVOKABLE inline double qtyOrdered() const { return _woNumber->_qtyOrdered;        }
     Q_INVOKABLE inline double qtyReceived() const { return _woNumber->_qtyReceived;      }
     Q_INVOKABLE inline double qtyBalance() const
@@ -129,6 +133,7 @@
       else
         return (_woNumber->_qtyOrdered - _woNumber->_qtyReceived);
     }
+    Q_INVOKABLE inline int    warehouse() const   { return _woNumber->warehouse();       }
 
   public slots:
     void setDataWidgetMap(XDataWidgetMapper* m);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7205
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7205&view=rev
Author:   gilmoskowitz
Date:     2009-10-15 16:56:25 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
issue #8333 - expose SeriesAdjust to scripting, probably temporary until std edition gets extracted

Modified Paths:
--------------
    xtuple/trunk/guiclient/guiclient.cpp

Modified: xtuple/trunk/guiclient/guiclient.cpp
===================================================================
--- xtuple/trunk/guiclient/guiclient.cpp	2009-10-15 13:28:35 UTC (rev 7204)
+++ xtuple/trunk/guiclient/guiclient.cpp	2009-10-15 16:56:25 UTC (rev 7205)
@@ -75,7 +75,7 @@
 #include "crmacctcluster.h"
 #include "crmaccount.h"
 #include "customer.h"
-
+#include "distributeInventory.h"
 #include "splashconst.h"
 #include "scripttoolbox.h"
 
@@ -1511,6 +1511,57 @@
   return _activeWindow;
 }
 
+// TODO: when std edition is extracted, replace this with a script include()
+QScriptValue distributeInventorySeriesAdjust(QScriptContext *context,
+                                             QScriptEngine  *engine)
+{
+  int result = -1;
+
+  if (context->argumentCount() == 1 &&
+      context->argument(0).isNumber())
+    result = distributeInventory::SeriesAdjust(context->argument(0).toInt32(),
+                                               0);
+
+  else if (context->argumentCount() == 2 &&
+           context->argument(0).isNumber() &&
+           qscriptvalue_cast<QWidget*>(context->argument(1)))
+    result = distributeInventory::SeriesAdjust(context->argument(0).toInt32(),
+           qscriptvalue_cast<QWidget*>(context->argument(1)));
+
+  else if (context->argumentCount() == 3 &&
+           context->argument(0).isNumber() &&
+           qscriptvalue_cast<QWidget*>(context->argument(1)))
+    result = distributeInventory::SeriesAdjust(context->argument(0).toInt32(),
+                             qscriptvalue_cast<QWidget*>(context->argument(1)),
+                             context->argument(2).toString());
+
+  else if (context->argumentCount() == 4 &&
+           context->argument(0).isNumber() &&
+           qscriptvalue_cast<QWidget*>(context->argument(1)) &&
+           context->argument(3).isDate())
+    result = distributeInventory::SeriesAdjust(context->argument(0).toInt32(),
+                             qscriptvalue_cast<QWidget*>(context->argument(1)),
+                             context->argument(2).toString(),
+                             context->argument(3).toDateTime().date());
+
+  else if (context->argumentCount() == 5 &&
+           context->argument(0).isNumber() &&
+           qscriptvalue_cast<QWidget*>(context->argument(1)) &&
+           context->argument(3).isDate() &&
+           context->argument(4).isDate())
+    result = distributeInventory::SeriesAdjust(context->argument(0).toInt32(),
+                             qscriptvalue_cast<QWidget*>(context->argument(1)),
+                             context->argument(2).toString(),
+                             context->argument(3).toDateTime().date(),
+                             context->argument(4).toDateTime().date());
+
+  else
+    context->throwError(QScriptContext::UnknownError,
+                        "could not find an appropriate SeriesAdjust method");
+
+  return engine->toScriptValue(result);
+}
+
 void GUIClient::loadScriptGlobals(QScriptEngine * engine)
 {
   if(!engine)
@@ -1563,6 +1614,11 @@
   engine->globalObject().setProperty("startOfTime", engine->newDate(QDateTime(_startOfTime)));
   engine->globalObject().setProperty("endOfTime", engine->newDate(QDateTime(_endOfTime)));
 
+  // TODO: when std edition is extracted, replace this with a script include()
+  QScriptValue distribInvObj = engine->newObject();
+  distribInvObj.setProperty("SeriesAdjust", distribInvObj,
+                            QScriptValue::ReadOnly | QScriptValue::Undeletable);
+  engine->globalObject().setProperty("DistributeInventory", distribInvObj);
 
   mainwindowval.setProperty("UndefinedError",  QScriptValue(engine, UndefinedError),
                             QScriptValue::ReadOnly | QScriptValue::Undeletable);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7203
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7203&view=rev
Author:   jrogelstad
Date:     2009-10-15 13:23:07 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Tweak: correct numeric role on qoh column.

Modified Paths:
--------------
    xtuple/trunk/guiclient/workOrder.cpp

Modified: xtuple/trunk/guiclient/workOrder.cpp
===================================================================
--- xtuple/trunk/guiclient/workOrder.cpp	2009-10-15 13:21:42 UTC (rev 7202)
+++ xtuple/trunk/guiclient/workOrder.cpp	2009-10-15 13:23:07 UTC (rev 7203)
@@ -818,8 +818,7 @@
     "                WHEN (wodata_id_type = 3) THEN 'emphasis' "
     "                WHEN (wodata_id_type = 1) THEN 'altemphasis' "
     "           ELSE null END AS qtforegroundrole, "
-    "           'qty' AS wodata_qoh_xtnumericrole, "
-    "           'qty' AS wodata_short_xtnumericrole, "
+    "           'qty' AS qoh_xtnumericrole, "
     "           'qtyper' AS qty_per_xtnumericrole, "
     "           'qty' AS qtyiss_xtnumericrole, "
     "           'qty' AS qtyrcv_xtnumericrole, "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7202
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7202&view=rev
Author:   srksharma
Date:     2009-10-15 13:21:42 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
updated scripts for DRP scenarios based on the Test Run

Modified Paths:
--------------
    xtupleqa/trunk/suite_MRP-MPS-DRP_Scenarios/tst_DRP Scenarios/test.js

Modified: xtupleqa/trunk/suite_MRP-MPS-DRP_Scenarios/tst_DRP Scenarios/test.js
===================================================================
--- xtupleqa/trunk/suite_MRP-MPS-DRP_Scenarios/tst_DRP Scenarios/test.js	2009-10-15 13:08:58 UTC (rev 7201)
+++ xtupleqa/trunk/suite_MRP-MPS-DRP_Scenarios/tst_DRP Scenarios/test.js	2009-10-15 13:21:42 UTC (rev 7202)
@@ -116,7 +116,7 @@
     type(":_planGroup._sequence_XSpinBox", "20");
     waitForObject(":Save_QPushButton");
     clickButton(":Save_QPushButton");
-    test.log("Warehouse WH2 update");    
+    test.log("Warehouse WH2 updated");    
     
     //---Create new Site: WH3----
     waitForObject(":List Sites.New_QPushButton");
@@ -590,7 +590,6 @@
     findObject(":Scheduling._safetyStock_XLineEdit").clear();
     type(":Scheduling._safetyStock_XLineEdit", "0");
     
-    
     findObject(":Scheduling.qt_spinbox_lineedit_QLineEdit").clear();
     type(":Scheduling.qt_spinbox_lineedit_QLineEdit","1");
     waitForObject(":Scheduling._orderGroup_QSpinBox");
@@ -700,8 +699,6 @@
     waitForObject(":_itemSite_XTreeWidget");
     doubleClickItem(":_itemSite_XTreeWidget", "DTRUCK1", 0, 0, 0, Qt.LeftButton);
     
-    
-        
     waitForObject(":List Item Sites.qt_tabwidget_tabbar_QTabBar");
     clickTab(":List Item Sites.qt_tabwidget_tabbar_QTabBar", "Planning");
     waitForObject(":_planningTab.Enforce Order Parameters_QGroupBox");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7201
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7201&view=rev
Author:   srksharma
Date:     2009-10-15 13:08:58 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Completed the creation of scripts for Batch Manager Submissions, when Batch Manager is disabled and enabled.

Modified Paths:
--------------
    xtupleqa/trunk/suite_Batch Manager Submissions/objects.map
    xtupleqa/trunk/suite_Batch Manager Submissions/tst_1_batch manager disabled/test.js
    xtupleqa/trunk/suite_Batch Manager Submissions/tst_2_batch manager enabled/test.js

Modified: xtupleqa/trunk/suite_Batch Manager Submissions/objects.map
===================================================================
--- xtupleqa/trunk/suite_Batch Manager Submissions/objects.map	2009-10-15 13:08:00 UTC (rev 7200)
+++ xtupleqa/trunk/suite_Batch Manager Submissions/objects.map	2009-10-15 13:08:58 UTC (rev 7201)
@@ -151,6 +151,8 @@
 :Incident_incident	{name='incident' type='incident' visible='1' windowTitle='Incident'}
 :Interface Options.Idle Timeout:_QLabel	{container=':_application.Interface Options_QGroupBox' name='_idleTimeoutLit' text='Idle Timeout:' type='QLabel' visible='1'}
 :Interface Options.qt_spinbox_lineedit_QLineEdit	{container=':_application.Interface Options_QGroupBox' name='qt_spinbox_lineedit' type='QLineEdit' visible='1'}
+:Invoice.Close_QPushButton	{container=':*.Invoice_QWorkspaceChild' name='_close' text='Close' type='QPushButton' visible='1'}
+:Invoice.OK_QPushButton	{container=':*.Invoice_QWorkspaceChild' text='OK' type='QPushButton' unnamed='1' visible='1'}
 :Invoice.Save_QPushButton	{container=':*.Invoice_QWorkspaceChild' name='_save' occurrence='2' text='Save' type='QPushButton' visible='1'}
 :Invoice.Save_QPushButton_2	{container=':*.Invoice_QWorkspaceChild' name='_save' text='Save' type='QPushButton' visible='1'}
 :Invoice._itemTypeGroup_QGroupBox	{container=':*.Invoice_QWorkspaceChild' name='_itemTypeGroup' type='QGroupBox' visible='1'}
@@ -201,6 +203,9 @@
 :List Sites.qt_tabwidget_tabbar_QTabBar	{container=':*.List Sites_QWorkspaceChild' name='qt_tabwidget_tabbar' type='QTabBar' visible='1'}
 :List Unposted Invoices.Close_QPushButton	{container=':*.List Unposted Invoices_QWorkspaceChild' name='_close' text='Close' type='QPushButton' visible='1'}
 :List Unposted Invoices.New_QPushButton	{container=':*.List Unposted Invoices_QWorkspaceChild' name='_new' text='New' type='QPushButton' visible='1'}
+:List Unposted Invoices.Print_QPushButton	{container=':*.List Unposted Invoices_QWorkspaceChild' name='_print' text='Print' type='QPushButton' visible='1'}
+:List Unposted Invoices.Print_QPushButton_2	{container=':*.List Unposted Invoices_QWorkspaceChild' name='_print' occurrence='2' text='Print' type='QPushButton' visible='1'}
+:List Unposted Invoices.Unposted Invoices:_QLabel	{container=':*.List Unposted Invoices_QWorkspaceChild' name='_purchaseOrdersLit' text='Unposted Invoices:' type='QLabel' visible='1'}
 :List Unposted Purchase Orders.Close_QPushButton	{container=':*.List Unposted Purchase Orders_QWorkspaceChild' name='_close' text='Close' type='QPushButton' visible='1'}
 :List Unposted Purchase Orders.Review EDI Before Sending_QDialog	{container=':*.List Unposted Purchase Orders_QWorkspaceChild' name='submitEDI' type='QDialog' visible='1' windowTitle='Review EDI Before Sending'}
 :List Unposted Purchase Orders._pohead_XTreeWidget	{container=':*.List Unposted Purchase Orders_QWorkspaceChild' name='_pohead' type='XTreeWidget' visible='1'}
@@ -209,6 +214,7 @@
 :List Users.Save_QPushButton	{container=':*.List Users_QWorkspaceChild' name='_save' text='Save' type='QPushButton' visible='1'}
 :List Users._usr_XTreeWidget	{container=':*.List Users_QWorkspaceChild' name='_usr' type='XTreeWidget' visible='1'}
 :List Users.qt_tabwidget_stackedwidget_QStackedWidget	{container=':*.List Users_QWorkspaceChild' name='qt_tabwidget_stackedwidget' type='QStackedWidget' visible='1'}
+:Log In.Aug 24 2009 09:05:21_QLabel	{name='_build' text='Aug 24 2009 09:05:21' type='QLabel' visible='1' window=':Log In_login2'}
 :Log In.Cancel_QPushButton	{name='_close' text='Cancel' type='QPushButton' visible='1' window=':Log In_login2'}
 :Log In.Options..._QPushButton	{name='_options' text='Options...' type='QPushButton' visible='1' window=':Log In_login2'}
 :Log In.Recent_QPushButton	{name='_recent' text='Recent' type='QPushButton' visible='1' window=':Log In_login2'}
@@ -722,6 +728,8 @@
 :_interval_QSpinBox	{buddy=':Database Information.Auto Update Signal Interval:_QLabel' name='_interval' type='QSpinBox' visible='1'}
 :_invGroup.Qty. Ordered:_QLabel	{container=':Sales Order._invGroup_QGroupBox' name='_qtyOrderedLit' text='Qty. Ordered:' type='QLabel' visible='1'}
 :_invGroup.Qty. Ordered:_QLabel_2	{container=':Quote._invGroup_QGroupBox' name='_qtyOrderedLit' text='Qty. Ordered:' type='QLabel' visible='1'}
+:_invchead_XTreeWidget	{buddy=':List Unposted Invoices.Unposted Invoices:_QLabel' name='_invchead' type='XTreeWidget' visible='1'}
+:_invoiceNumber_XLineEdit	{buddy=':headerTab.Invoice #:_QLabel' name='_invoiceNumber' type='XLineEdit' visible='1'}
 :_invoice_XTreeWidget	{buddy=':Re-Print Invoices.Invoices:_QLabel' name='_invoice' type='XTreeWidget' visible='1'}
 :_itemGroup...._QPushButton	{container=':Planned Order._itemGroup_QGroupBox' name='_itemList' text='...' type='QPushButton' visible='1'}
 :_itemGroup...._QPushButton_2	{container=':Sales Order._itemGroup_QGroupBox' name='_itemList' text='...' type='QPushButton' visible='1'}
@@ -867,6 +875,7 @@
 :groupBox_2.Items:_QLabel	{container=':_typeGroup.groupBox_2_QGroupBox' name='_itemsLit' text='Items:' type='QLabel' visible='1'}
 :groupBox_2.XDateEdit_XDateEdit	{container=':Release Planned Orders by Planner Code.groupBox_2_QGroupBox' name='XDateEdit' type='XDateEdit' visible='1'}
 :headerTab...._QPushButton	{container=':qt_tabwidget_stackedwidget.headerTab_QWidget' name='_list' text='...' type='QPushButton' visible='1'}
+:headerTab.Invoice #:_QLabel	{container=':qt_tabwidget_stackedwidget.headerTab_QWidget' name='_invoiceNumberLit' text='Invoice #:' type='QLabel' visible='1'}
 :headerTab._titleLit_QLabel	{container=':qt_tabwidget_stackedwidget.headerTab_QWidget' name='_titleLit' type='QLabel' visible='1'}
 :lineItemsTab.New_QPushButton	{container=':qt_tabwidget_stackedwidget.lineItemsTab_QWidget' name='_new' text='New' type='QPushButton' visible='1'}
 :qt_tabwidget_stackedwidget.EDI Relationships_QWidget	{container=':Prospect.qt_tabwidget_stackedwidget_QStackedWidget' name='edirelation' type='QWidget' visible='1' windowTitle='EDI Relationships'}

Modified: xtupleqa/trunk/suite_Batch Manager Submissions/tst_1_batch manager disabled/test.js
===================================================================
--- xtupleqa/trunk/suite_Batch Manager Submissions/tst_1_batch manager disabled/test.js	2009-10-15 13:08:00 UTC (rev 7200)
+++ xtupleqa/trunk/suite_Batch Manager Submissions/tst_1_batch manager disabled/test.js	2009-10-15 13:08:58 UTC (rev 7201)
@@ -1244,15 +1244,6 @@
     doubleClickItem(":_listTab_XTreeWidget_12", "TTOYS", 5, 5, 0, Qt.LeftButton);
     waitForObject(":Print Statement by Customer.Print_QPushButton");
     clickButton(":Print Statement by Customer.Print_QPushButton");
-    
-    nativeType("<Tab>"); 
-    nativeType("<Tab>");
-    nativeType("<Tab>"); 
-    nativeType("<Tab>"); 
-    nativeType("<Tab>"); 
-    nativeType("<Tab>"); 
-    nativeType("<Tab>"); 
-    nativeType("<Tab>");    
     snooze(1);	  
     nativeType("<Return>");
     

Modified: xtupleqa/trunk/suite_Batch Manager Submissions/tst_2_batch manager enabled/test.js
===================================================================
--- xtupleqa/trunk/suite_Batch Manager Submissions/tst_2_batch manager enabled/test.js	2009-10-15 13:08:00 UTC (rev 7200)
+++ xtupleqa/trunk/suite_Batch Manager Submissions/tst_2_batch manager enabled/test.js	2009-10-15 13:08:58 UTC (rev 7201)
@@ -1948,6 +1948,9 @@
     clickButton(":headerTab...._QPushButton");
     waitForObject(":_listTab_XTreeWidget_8");
     doubleClickItem(":_listTab_XTreeWidget_8", "TTOYS", 5, 5, 0, Qt.LeftButton);
+    
+    var invoice = findObject(":_invoiceNumber_XLineEdit").text;
+    
     waitForObject(":Invoice.qt_tabwidget_tabbar_QTabBar");
     clickTab(":Invoice.qt_tabwidget_tabbar_QTabBar", "Line Items");
     waitForObject(":lineItemsTab.New_QPushButton");
@@ -1964,31 +1967,25 @@
     waitForObject(":Invoice.Save_QPushButton");
     clickButton(":Invoice.Save_QPushButton");
     waitForObject(":Invoice.Save_QPushButton_2");
-    clickButton(":Invoice.Save_QPushButton_2");
+    clickButton(":Invoice.Save_QPushButton_2"); 
     
-    waitForObject(":List Unposted Invoices.Close_QPushButton");
-    clickButton(":List Unposted Invoices.Close_QPushButton");
-    
     //-----Print Invoices(Sales)-----
-    waitForObjectItem(":xTuple ERP: *_QMenuBar", "Sales");
-    activateItem(":xTuple ERP: *_QMenuBar", "Sales");
-    waitForObjectItem(":*.Sales_QMenu", "Billing");
-    activateItem(":*.Sales_QMenu", "Billing");
-    waitForObjectItem(":*.Billing_QMenu", "Forms");
-    activateItem(":*.Billing_QMenu", "Forms");
-    waitForObjectItem(":*.Forms_QMenu_2", "Print Invoices...");
-    activateItem(":*.Forms_QMenu_2", "Print Invoices...");
+    waitForObject(":_invchead_XTreeWidget");
+    clickItem(":_invchead_XTreeWidget", invoice, 5, 5, 1, Qt.LeftButton);
     
-    waitForObject(":Print Invoices.Print_QPushButton");
-    clickButton(":Print Invoices.Print_QPushButton");    
+    waitForObject(":List Unposted Invoices.Print_QPushButton");
+    clickButton(":List Unposted Invoices.Print_QPushButton");
+    
+    waitForObject(":List Unposted Invoices.Print_QPushButton_2");
+    clickButton(":List Unposted Invoices.Print_QPushButton_2");
     snooze(1);	  
     nativeType("<Return>");  
     
     waitForObject(":Review EDI Before Sending.Accept_QPushButton");
     clickButton(":Review EDI Before Sending.Accept_QPushButton");
     
-    waitForObject(":Mark Invoices as Printed?.Yes_QPushButton");
-    clickButton(":Mark Invoices as Printed?.Yes_QPushButton");
+    waitForObject(":List Unposted Invoices.Close_QPushButton");
+    clickButton(":List Unposted Invoices.Close_QPushButton");
     
     //-----Verify the submission in Batch Manager-----
     var result = batchmanager();
@@ -2016,6 +2013,9 @@
     clickButton(":headerTab...._QPushButton");
     waitForObject(":_listTab_XTreeWidget_8");
     doubleClickItem(":_listTab_XTreeWidget_8", "TTOYS", 5, 5, 0, Qt.LeftButton);
+    
+    var invoice =  findObject(":_invoiceNumber_XLineEdit").text;
+    
     waitForObject(":Invoice.qt_tabwidget_tabbar_QTabBar");
     clickTab(":Invoice.qt_tabwidget_tabbar_QTabBar", "Line Items");
     waitForObject(":lineItemsTab.New_QPushButton");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7200
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7200&view=rev
Author:   srksharma
Date:     2009-10-15 13:08:00 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Updated Scripts for Purchase Order Processing   - Scenarios for MLC item type

Modified Paths:
--------------
    xtupleqa/trunk/suite_Purchase Order Processing/tst_purchaseorder/test.js

Modified: xtupleqa/trunk/suite_Purchase Order Processing/tst_purchaseorder/test.js
===================================================================
--- xtupleqa/trunk/suite_Purchase Order Processing/tst_purchaseorder/test.js	2009-10-15 13:06:59 UTC (rev 7199)
+++ xtupleqa/trunk/suite_Purchase Order Processing/tst_purchaseorder/test.js	2009-10-15 13:08:00 UTC (rev 7200)
@@ -38,7 +38,7 @@
     waitForObject(":Encryption Configuration.Save_QPushButton");
     clickButton(":Encryption Configuration.Save_QPushButton");
     
-    waitForObjectItem(":xTuple ERP: *_QMenuBar_3", "System");
+    waitForObjectItem(":xTuple ERP: *_QMenuBar_3", "System");    
     activateItem(":xTuple ERP: *_QMenuBar_3", "System");
     waitForObjectItem(":xTuple ERP: *.System_QMenu_2", "Exit xTuple ERP...");
     activateItem(":xTuple ERP: *.System_QMenu_2", "Exit xTuple ERP...");
@@ -188,7 +188,7 @@
         type(":_schedGroup.XDateEdit_XDateEdit", "+7");
         
         var lotlineitem = findObject(":groupBox_2._itemNumber_ItemLineEdit").text;         
-        var lotquantity = findObject(":_ordered_XLineEdit").text;       
+        var lotqty = findObject(":_ordered_XLineEdit").text;       
         
         waitForObject(":Purchase Order.Save_QPushButton");
         clickButton(":Purchase Order.Save_QPushButton");
@@ -558,7 +558,7 @@
     
     var qoh = replaceSubstring(sNameOfRootItem4.latin1(),",","");
     
-    var sum = (parseInt(poquantity.toString()) + parseInt(result.toString()));
+    var sum = (parseInt(lotqty.toString()) + parseInt(result.toString()));
     
     if(parseInt(qoh.toString()) == parseInt(sum.toString())) 
         test.pass("QOH updated correctly for Receiving Purchase goods for Lot controlled item types");
@@ -587,7 +587,7 @@
     
     var qoh = replaceSubstring(sNameOfRootItem6.latin1(),",","");
     
-    var sum = (parseInt(poquantity.toString()) + parseInt(result.toString()));
+    var sum = (parseInt(serialqty.toString()) + parseInt(result.toString()));
     
     if(parseInt(qoh.toString()) == parseInt(sum.toString())) 
         test.pass("QOH updated correctly for Receiving Purchase goods for Serial controlled item types");
@@ -616,7 +616,7 @@
     
     var qoh = replaceSubstring(sNameOfRootItem8.latin1(),",","");
     
-    var sum = (parseInt(poquantity.toString()) + parseInt(result.toString()));
+    var sum = (parseInt(mlcqty.toString()) + parseInt(result.toString()));
     
     if(parseInt(qoh.toString()) == parseInt(sum.toString())) 
         test.pass("QOH updated correctly for Receiving Purchase goods for MLC item types");
@@ -705,8 +705,7 @@
     
     waitForObject(":Voucher.Cancel_QPushButton");
     clickButton(":Voucher.Cancel_QPushButton");
-    test.log("Voucher created successfully");
-    
+        
     //-----Posting Vouchers-----
     waitForObjectItem(":xTuple ERP: *_QMenuBar_3", "Accounting");
     activateItem(":xTuple ERP: *_QMenuBar_3", "Accounting");
@@ -719,7 +718,7 @@
     
     waitForObject(":List Open Vouchers._vohead_XTreeWidget");
     if(!clickItem(":List Open Vouchers._vohead_XTreeWidget", vounumber, 5, 5, 1, Qt.LeftButton))
-        test.pass(" Voucher created ");
+        test.pass(" Voucher created");
     else test.fail(" Voucher not created");
     
     waitForObject(":List Open Vouchers.Post_QPushButton");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7199
          http://postbooks.svn.sourceforge.net/postbooks/?rev=7199&view=rev
Author:   cryan
Date:     2009-10-15 13:06:59 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Removed function that was moved to xtmfg package.

Modified Paths:
--------------
    xtupleserver/trunk/updatescripts/from_330/dropFunctions.sql

Modified: xtupleserver/trunk/updatescripts/from_330/dropFunctions.sql
===================================================================
--- xtupleserver/trunk/updatescripts/from_330/dropFunctions.sql	2009-10-14 20:26:49 UTC (rev 7198)
+++ xtupleserver/trunk/updatescripts/from_330/dropFunctions.sql	2009-10-15 13:06:59 UTC (rev 7199)
@@ -3,6 +3,7 @@
 SELECT dropIfExists('FUNCTION', 'deleteworkcenter(integer)');
 SELECT dropIfExists('FUNCTION', 'explodePlannedOrder(INTEGER, BOOLEAN)');
 SELECT dropIfExists('FUNCTION', 'checkBOOSitePrivs(INTEGER)');
+SELECT dropIfExists('FUNCTION', 'unWoClockOut(INTEGER)');
 
 COMMIT;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.