Permalink
Switch branches/tags
Nothing to show
Commits on Sep 3, 2018
  1. Include the discount amount for the transaction

    Paul Becker authored and timschofield committed Sep 3, 2018
    Files changed in commit:
    Z_CheckDebtorsControl.php
    On branch develop
    
    http://www.weberp.org/forum/showthread.php?tid=8188
  2. Include the fact that it is a QA label in the file name

    Paul Becker authored and timschofield committed Sep 3, 2018
    Files changed in commit:
    PDFQALabel.php
    On branch develop
    
    http://www.weberp.org/forum/showthread.php?tid=8198
Commits on Sep 1, 2018
  1. Add order number into file name

    Paul Becker authored and timschofield committed Sep 1, 2018
    Files changed in commit:
    PrintCustOrder_generic.php
    On branch develop
    
    http://www.weberp.org/forum/showthread.php?tid=8194
Commits on Aug 27, 2018
  1. CSS to separate the title icon from the title text

    timschofield committed Aug 27, 2018
    Files changed in commit:
    css/aguapop/default.css
    css/arc-dark/default.css
    css/default/default.css
    css/fluid/default.css
    css/fresh/default.css
    css/gel/default.css
    css/professional-rtl/default.css
    css/professional/default.css
    css/silverwolf/default.css
    css/wood/default.css
    css/xenos/default.css
    On branch develop
Commits on Jul 30, 2018
  1. Add a input check for the sortby input

    ExsonQu-xun authored and timschofield committed Jul 30, 2018
    Files changed in commit:
    SalesInquiry.php
    On branch develop
Commits on Jul 20, 2018
  1. Merge pull request #4 from TurboPT/develop

    timschofield committed Jul 20, 2018
    Fix tag name typo
  2. Update AccountGroups.php

    TurboPT committed Jul 20, 2018
  3. Update AccountGroups.php

    TurboPT committed Jul 20, 2018
    Correct typo in tag name.
Commits on Jul 18, 2018
  1. Use new css for layouts and new error checking

    timschofield committed Jul 18, 2018
    Files changed in commit:
    Departments.php
    On branch develop
    
    Use new fieldset css for better looking forms
    Use new RecordExists() function for better error checking
  2. Improve display with new form layout and enhanced error checking

    timschofield committed Jul 18, 2018
    Files changed in commit:
    WorkCentres.php
    includes/SQL_CommonFunctions.php
    On branch develop
    
    Create new function to test if a record already exists
    Use new error checking function in WorkCentres.php
    Use new form layout in WorkCentres.php
Commits on Jul 5, 2018
  1. Create entries for all of the HR/Payroll scripts

    timschofield committed Jul 5, 2018
    Files changed in commit:
    sql/updates/197.php
    On branch develop
  2. Move the qrcodes.php script to the correct directory

    timschofield committed Jul 5, 2018
    Files changed in commit:
    includes/tcpdf/barcodes/qrcode.php
    includes/tcpdf/include/barcodes/qrcode.php
    On branch develop
Commits on Jul 3, 2018
  1. Merge the new commissions functionality back into the main line

    timschofield committed Jul 3, 2018
    Files changed in commit:
    CompanyPreferences.php
    ConfirmDispatch_Invoice.php
    Credit_Invoice.php
    SalesCommissionRates.php
    SalesCommissionReports.php
    SalesCommissionStatements.php
    SalesCommissionTypes.php
    SalesPeople.php
    Suppliers.php
    includes/CommissionFunctions.php
    includes/DateFunctions.php
    sql/updates/196.php
    On branch develop
  2. Simplify the code and bring it in line with other scripts.

    timschofield committed Jul 3, 2018
    Files changed in commit:
    Suppliers.php
    On branch develop
Commits on Jun 18, 2018
  1. Make the code more readable and flows from the top, also add comments.

    timschofield committed Jun 18, 2018
    Files changed in commit:
    SupplierInquiry.php
    On branch develop
  2. Add a legend to the fieldset

    timschofield committed Jun 18, 2018
    Files changed in commit:
    WWW_Access.php
    On branch develop
  3. MRP.php fix reorder qty insert calculation | | BrianTMG | 2018-06-17 …

    Brian May authored and timschofield committed Jun 18, 2018
    …| [View](webERP-team/webERP@ab6308d) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8175) |
    
    Files changed in commit:
    MRP.php
    On branch develop
Commits on Jun 1, 2018
  1. Use the KwaMoja escape string function rather than the inbuilt one

    timschofield committed Jun 1, 2018
    Files changed in commit:
    includes/UpgradeDB_mariadb.php
    includes/UpgradeDB_mysql.php
    includes/UpgradeDB_mysqli.php
    On branch develop
  2. New script to produce statements for sales people regarding their com…

    timschofield committed Jun 1, 2018
    …missions
    
    Files changed in commit:
    SalesCommissionStatements.php
    On branch commissions
  3. New script to produce reports for sales commssions based on various c…

    timschofield committed Jun 1, 2018
    …riteria
    
    Files changed in commit:
    SalesCommissionReports.php
    On branch commissions
  4. New script to populate the rates table for the sales commissions func…

    timschofield committed Jun 1, 2018
    …tionality
    
    Files changed in commit:
    SalesCommissionRates.php
    On branch commissions
  5. Changes for the new sales commission functionality

    timschofield committed Jun 1, 2018
    Files changed in commit:
    SalesPeople.php
    On branch commissions
    
    Remove the old sales commission fields
    Add in field for the frequency the sales person gets commission
    Add in a field for the calculation method to be used for this
    sales persons commission
    Add in a field for the eneral Ledger expense code to post the
    sales commission to
  6. Calculate the commission on invoices and credit notes

    timschofield committed Jun 1, 2018
    Files changed in commit:
    ConfirmDispatch_Invoice.php
    Credit_Invoice.php
    On branch commissions
  7. New script to maintain the sales commission calculation methods

    timschofield committed Jun 1, 2018
    Files changed in commit:
    SalesCommissionTypes.php
    On branch commissions
  8. Include the new functions for the sales commission functionality

    timschofield committed Jun 1, 2018
    Files changed in commit:
    includes/CommissionFunctions.php
    includes/DateFunctions.php
    On branch commissions
    
    Include new function to return array of periods for this
    quarter/year etc
    Include the commission calculation functions
  9. New database changes for the sales commissions functionality

    timschofield committed Jun 1, 2018
    Files changed in commit:
    sql/updates/196.php
    On branch commissions
    
    New table for sales commission calculation methods - salescommissiontypes
    Add in 3 fields to the salescommissiontypes table for default methods
    New table for the commission rates - salescommissionrates
    New table for sales commission - salescommissions
    Add a column glaccount to the salesman table to hold the P&L general
    ledger code for this sales persons commission
    Add a column comissiontypeid to the salesman table to contain the
    calculation method used for this sales person
    Add a column commissionperiod to the salesman table to contain the
    frequency that this sales person gets commission
    Add a column commissionsact to the companies table to contain the
    general ledger code for the commissions accrual
    Add a column salespersonid to the suppliers table to hold the sales
    person code if this supplier is a sales person
    Drop the column commissionrate1 from the salesman table
    Drop the column commissionrate2 from the salesman table
    Drop the column breakpoint from the salesman table
    Create a page security setting for the SalesCommissionTypes.php script
    Create a page security setting for the SalesCommissionRates.php script
    Create a page security setting for the SalesCommissionReports.php script
    Create a new menu item for the SalesCommissionReports.php script
    Create a new menu item for the SalesCommissionTypes.php script
    Create a new systype entry 39 for Sales Commision Accruals
    
    http://www.weberp.org/forum/showthread.php?tid=8159
  10. New company field for the commissions accrual account

    timschofield committed Jun 1, 2018
    Files changed in commit:
    CompanyPreferences.php
    On branch commissions
    
    Add in a field for the General ledger code that will contain
    the accrual for sales person commissions
  11. Merge pull request #3 from juergenmueller77/develop

    timschofield committed Jun 1, 2018
    New password change functionality
  12. Improvements to the force password change functionality

    juergenmueller77 committed Jun 1, 2018
    Files changed in commit:
    ChangePassword.php
    WWW_Users.php
    includes/session.php
    javascripts/ChangePassword.js
    sql/updates/195.php
    On branch develop
Commits on May 31, 2018
  1. Deal correctly with the message prefix

    timschofield committed May 31, 2018
    Files changed in commit:
    includes/footer.php
    On branch develop
Commits on May 30, 2018
  1. Creates a flag to force a user to change their

    juergenmueller77 committed May 30, 2018
    password at the next login
    
    Files changed in commit:
    ChangePassword.php
    WWW_Users.php
    includes/session.php
    javascripts/ChangePassword.js
    sql/updates/195.php
    On branch develop
    
    Creates extra field in www_users table to hold the flag
    Updates the flag in WWW_Users.php
    Tests for the flag in session.php
    If flag is reset redirects to ChangePassword.php
    Javascript checks that both passwords agree
Commits on May 29, 2018
  1. Merge pull request #2 from timschofield/develop

    juergenmueller77 committed May 29, 2018
    Use new form layout
Commits on May 25, 2018
  1. Use new form layout

    timschofield committed May 25, 2018
    Files changed in commit:
    UnitsOfMeasure.php
    On branch develop
    
    Use new form layout
    Clean up code