Routine development.

thcristo · Sep 13, 2013 · 578f443 · 578f443
1 parent 9e77b8e
commit 578f443
Show file tree

Hide file tree

Showing 26 changed files with 1,748 additions and 837 deletions.
diff --git a/MixERP.Net.BusinessLayer/Transactions/NonGlStockTransaction.cs b/MixERP.Net.BusinessLayer/Transactions/NonGlStockTransaction.cs
@@ -52,7 +52,7 @@ public static long Add(string book, DateTime valueDate, string partyCode, int pr
 
         public static System.Data.DataTable GetView(string book, DateTime dateFrom, DateTime dateTo, string office, string party, string priceType, string user, string referenceNumber, string statementReference)
         {
-            return MixERP.Net.DatabaseLayer.Transactions.NonGLStockTransaction.GetView(book, MixERP.Net.BusinessLayer.Helpers.SessionHelper.OfficeId(), dateFrom, dateTo, office, party, priceType, user, referenceNumber, statementReference);
+            return MixERP.Net.DatabaseLayer.Transactions.NonGLStockTransaction.GetView(MixERP.Net.BusinessLayer.Helpers.SessionHelper.UserId(), book, MixERP.Net.BusinessLayer.Helpers.SessionHelper.OfficeId(), dateFrom, dateTo, office, party, priceType, user, referenceNumber, statementReference);
         }
     }
 }
diff --git a/MixERP.Net.DatabaseLayer/Transactions/NonGlStockTransaction.cs b/MixERP.Net.DatabaseLayer/Transactions/NonGlStockTransaction.cs
@@ -116,12 +116,13 @@ public static long Add(string book, DateTime valueDate, int officeId, int userId
             }
         }
 
-        public static System.Data.DataTable GetView(string book, int officeId, DateTime dateFrom, DateTime dateTo, string office, string party, string priceType, string user, string referenceNumber, string statementReference)
+        public static System.Data.DataTable GetView(int userId, string book, int officeId, DateTime dateFrom, DateTime dateTo, string office, string party, string priceType, string user, string referenceNumber, string statementReference)
         {
-            string sql = "SELECT * FROM transactions.get_product_view(@Book::text, @OfficeId::integer, @DateFrom::date, @DateTo::date, @Office::national character varying(12), @Party::text, @PriceType::text, @User::national character varying(50), @ReferenceNumber::national character varying(24), @StatementReference::text);";
+            string sql = "SELECT * FROM transactions.get_product_view(@UserId::integer, @Book::text, @OfficeId::integer, @DateFrom::date, @DateTo::date, @Office::national character varying(12), @Party::text, @PriceType::text, @User::national character varying(50), @ReferenceNumber::national character varying(24), @StatementReference::text);";
 
             using(NpgsqlCommand command = new NpgsqlCommand(sql))
             {
+                command.Parameters.AddWithValue("@UserId", userId);
                 command.Parameters.AddWithValue("@Book", book);
                 command.Parameters.AddWithValue("@OfficeId", officeId);
                 command.Parameters.AddWithValue("@DateFrom", dateFrom);

diff --git a/MixERP.Net.FrontEnd/App_GlobalResources/FormResource.Designer.cs b/MixERP.Net.FrontEnd/App_GlobalResources/FormResource.Designer.cs
diff --git a/MixERP.Net.FrontEnd/App_GlobalResources/FormResource.resx b/MixERP.Net.FrontEnd/App_GlobalResources/FormResource.resx
@@ -1077,4 +1077,16 @@
   <data name="audit_user_id" xml:space="preserve">
     <value>Audit User Id</value>
   </data>
+  <data name="actions" xml:space="preserve">
+    <value>Actions</value>
+  </data>
+  <data name="non_gl_stock_master_id" xml:space="preserve">
+    <value>Id</value>
+  </data>
+  <data name="resource" xml:space="preserve">
+    <value>Resource</value>
+  </data>
+  <data name="flag_color" xml:space="preserve">
+    <value>Flag Color</value>
+  </data>
 </root>
diff --git a/MixERP.Net.FrontEnd/App_Themes/MixERP/Default.css b/MixERP.Net.FrontEnd/App_Themes/MixERP/Default.css
@@ -114,62 +114,66 @@ a
 
 
 
-                body
-    {
-        font-size: 11px!important;
-    }
+body
+{
+    font-size: 11px!important;
+}
 
-    hr
-    {
-        border: 1px solid gray;
-        border-top: 0px;
-    }
+hr
+{
+    border: 1px solid gray;
+    border-top: 0px;
+}
 
-    table.report tr th, table.report tr td
-    {
-        padding: 4px;
-    }
+table.report tr th, table.report tr td
+{
+    padding: 4px;
+}
 
 
-    .table
+.table
+{
+    border-collapse: collapse;
+    border: 1px solid gray;
+    min-width: 400px;
+}
+
+    .table td
     {
-        border-collapse: collapse;
         border: 1px solid gray;
-        min-width: 400px;
+        padding: 4px!important;
     }
 
-        .table td
-        {
-            border: 1px solid gray;
-            padding: 4px!important;
-        }
+table.horizontal > tbody > tr > td:first-child
+{
+    width: 180px;
+    font-weight: bold;
+}
 
-    table.horizontal > tbody > tr > td:first-child
-    {
-        width: 180px;
-        font-weight: bold;
-    }
 
+.report-command
+{
+    border: 1px solid #EDCAF7;
+    position: absolute;
+    padding: 4px 12px 4px 12px;
+    top: 20px;
+    right: 20px;
+    background-color: #F8EBFC;
+}
 
-    .report-command
+    .report-command:hover
     {
-        border: 1px solid #EDCAF7;
-        position: absolute;
-        padding: 4px 12px 4px 12px;
-        top: 20px;
-        right: 20px;
-        background-color: #F8EBFC;
+        background-color: #F2DAFA;
     }
 
-        .report-command:hover
-        {
-            background-color: #F2DAFA;
-        }
-
-    @media print
+@media print
+{
+    .hide
     {
-        .hide
-        {
-            display: none;
-        }
+        display: none;
     }
+}
+
+
+
+
diff --git a/MixERP.Net.FrontEnd/MixERP.Net.FrontEnd.csproj b/MixERP.Net.FrontEnd/MixERP.Net.FrontEnd.csproj
@@ -643,6 +643,13 @@
     <Compile Include="Sales\Confirmation\ReportDirectSalesInovice.aspx.designer.cs">
       <DependentUpon>ReportDirectSalesInovice.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Sales\Confirmation\ReportSalesQuotation.aspx.cs">
+      <DependentUpon>ReportSalesQuotation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Sales\Confirmation\ReportSalesQuotation.aspx.designer.cs">
+      <DependentUpon>ReportSalesQuotation.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Sales\DeliveryForOrder.aspx.cs">
       <DependentUpon>DeliveryForOrder.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1097,6 +1104,9 @@
     <Content Include="Reports\Assets\Header.html" />
     <Content Include="Reports\ReportMaster.aspx" />
     <Content Include="Reports\ReportViewer.aspx" />
+    <Content Include="Reports\Sources\en-US\Sales.View.Sales.Quotation.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Reports\Sources\en-US\Sales.View.Sales.CustomerDeliveryNote.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -1140,6 +1150,7 @@
     <Content Include="Sales\Confirmation\DirectSales.aspx" />
     <Content Include="Sales\Confirmation\ReportDeliveryNote.aspx" />
     <Content Include="Sales\Confirmation\ReportDirectSalesInovice.aspx" />
+    <Content Include="Sales\Confirmation\ReportSalesQuotation.aspx" />
     <Content Include="Sales\DeliveryForOrder.aspx" />
     <Content Include="Sales\DeliveryWithoutOrder.aspx" />
     <Content Include="Sales\DirectSales.aspx" />
@@ -1470,6 +1481,9 @@
     <Content Include="Scripts\jquery.min.js" />
     <Content Include="Scripts\jqueryNumber\jquery.number.min.js" />
     <Content Include="Scripts\mixerp.js" />
+    <Content Include="Scripts\raphaeljs\analytics.js" />
+    <Content Include="Scripts\raphaeljs\popup.js" />
+    <Content Include="Scripts\raphaeljs\raphael-min.js" />
     <Content Include="Scripts\shortcut.js" />
     <Content Include="Services\AccountData.asmx" />
     <Content Include="Services\ItemData.asmx" />
@@ -1512,9 +1526,6 @@
     <Content Include="MenuMaster.Master" />
     <Content Include="MixERPMaster.Master" />
     <Content Include="Scripts\CodeMirror\.travis.yml" />
-    <Content Include="Scripts\CodeMirror\bin\compress" />
-    <Content Include="Scripts\CodeMirror\bin\lint" />
-    <Content Include="Scripts\CodeMirror\bin\source-highlight" />
     <Content Include="Scripts\CodeMirror\bower.json" />
     <Content Include="Scripts\CodeMirror\CONTRIBUTING.md" />
     <Content Include="Scripts\CodeMirror\LICENSE" />
@@ -1564,6 +1575,7 @@
     <Folder Include="Resource\DatabaseBackups\" />
     <Folder Include="Resource\Frameworks\" />
     <Folder Include="Resource\Logo\" />
+    <Folder Include="Scripts\CodeMirror\bin\" />
     <Folder Include="Setup\General\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MixERP.Net.FrontEnd/MixERPMaster.Master b/MixERP.Net.FrontEnd/MixERPMaster.Master
@@ -13,12 +13,17 @@ http://mozilla.org/MPL/2.0/.
 <html>
 <head runat="server">
     <link href="~/themes/purple/main.css" rel="stylesheet" type="text/css" runat="server" />
+
+    <script src="/Scripts/raphaeljs/raphael-min.js"></script>
+
     <script src="/Scripts/jquery.min.js" type="text/javascript"></script>
     <script src="/Scripts/shortcut.js"></script>
     <script src="/Scripts/colorbox/jquery.colorbox-min.js"></script>
     <script src="/Scripts/jqueryNumber/jquery.number.min.js"></script>
     <script src="/Scripts/date.js"></script>
+
     <link href="/Scripts/colorbox/colorbox.css" rel="stylesheet" />
+
     <title>MixErp® Beta</title>
     <asp:ContentPlaceHolder ID="ScriptContentPlaceHolder" runat="server">
     </asp:ContentPlaceHolder>
@@ -82,6 +87,7 @@ http://mozilla.org/MPL/2.0/.
 
         function pageLoad(sender, args) {
             $(".item-selector").colorbox({ iframe: true, innerWidth: 1024, innerHeight: 450, overlayClose: false });
+            $(".preview").colorbox({ iframe: true, innerWidth: 1024, innerHeight: 450, overlayClose: false });
         }