jekkos
70b7a03c63
Show item location next to quantity purchased in detailed receiving and
...
sale report
Remove duplicate suggestions in sale and receiving module
Show item location on receipt if multiple are configured
Check if item location is allowed when adding items in sale or receiving
2015-07-08 21:41:41 +02:00
jekkos
b85b9d37a1
Add company_name field to customers for invoicing purposes
...
Total discount is now shown as one amount in receipt
Conflicts:
application/controllers/sales.php
Conflicts:
database/migrate_phppos.sql
2015-04-06 15:15:34 +02:00
jekkos
86bf8866f0
Do duplicated cookie check before echo'ing output in items (fix for #49 )
2015-03-31 16:33:29 +02:00
jekkos
ca2c9a6ae4
Item refresh fix for issue #42
...
Invoice number in email message are denoted with $INV
Sale id's in email message are denoted with POS $sale_id
2015-03-17 17:41:12 +01:00
jekkos-t520
e0fd35220e
Add custom search back into items
...
Fix proper pagintaion for filtered item views w/o search
2015-03-04 20:53:38 +01:00
jekkos-t520
ffb8501276
Fix custom search
2015-02-27 16:03:52 +01:00
jekkos-t520
b02b16b63e
Only show company name in supplier's dropdown
2015-02-25 13:30:18 +01:00
jekkos-t520
b752ec9952
Fix item bulk update
2015-02-24 08:51:09 +01:00
jekkos-t520
8e221033bf
Add label for products on low inventory (items filtering)
...
Add stock location to method call for items pagination
Move item pagination links
2015-02-21 22:35:28 +01:00
jekkos-t520
9e427485f3
Fix items module filtering
...
Fix double to_currency wrapper for amount_change in receipt
Fix tablesorter js error with empty tables
Upgrade tablesorter.js to latest version
Adapt some labels for dutch
2015-02-21 18:05:12 +01:00
jekkos-t520
c389e6030c
Fix pagination for all modules (links updated for index+search through
...
AJAX)
2015-02-20 17:36:03 +01:00
jekkos-t520
9b61e0ad67
Add proper location id for 0 quantities
2015-02-17 11:14:28 +01:00
jekkos-t520
40eef74aa0
Adapt load_config hook to fallback to english if no valid language is
...
present
Move CI system language files back to their correct location
(form_validation_lang)
Add upload_lang.php and email_lang.php to system files (default english
version for the time being)
Add account_number check when importing customer data from excel
Avoid unnecessary calls to check_item_number when importing items from
excel
2015-02-17 11:06:28 +01:00
jekkos-t520
ade913f0e4
Merge github pull request #30
2015-02-11 16:31:31 +01:00
jekkos-t520
f021215cbb
Show proper error message on upload misconfiguration
...
Use jquery-validation to do item_number check
Fix invoice_number validation in sale edit form
2015-02-11 11:32:58 +01:00
jekkos-t520
9191eb4535
Show error messages in item form when upload fails
...
Remove check for validation flag in handle_server_validation
2015-02-11 08:53:16 +01:00
jekkos-t520
c40ad31ed0
Review item import (check item_number and throw proper error)
2015-02-10 15:43:10 +01:00
jekkos-t520
d208e6dccb
set menubar font sizes to px instead of pt
...
add item_number duplication check when adding new items
fix barcode on receivings receipt (after completion)
change backup db download format to gz
2015-02-10 10:56:37 +01:00
jekkos-t520
28711df45a
Merge branch 'feature/item_pics'
...
Conflicts:
application/helpers/table_helper.php
2015-02-06 16:55:09 +01:00
jekkos-t520
f77f2e6e29
item pics are now resized and cached server side
2015-02-06 16:53:37 +01:00
jekkos-t520
f2fd360d23
Minimal working OpenStreetMap autocomplete
...
Refactor jkey F-key bindings
2015-02-05 14:08:40 +01:00
jekkos-t520
8ccba57d98
Images are not removed from items when no file is chosen
...
Image thumbnails are resized proportionally and updated after update_row
refresh
Add some padding to the thumbnails
Move select specific styles to ospos.css stylesheet
2015-02-04 15:29:34 +01:00
jekkos-t520
7efb1428f5
Basic image upload working now
2015-02-04 13:27:09 +01:00
jekkos-t520
4556938154
Add cookie cleanup after search() and get_row()
2015-01-25 14:32:15 +01:00
jekkos-t520
a2b7ff688d
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-01-25 14:13:38 +01:00
jekkos-t520
1d9661d0b0
Add name, price and company name as possible barcode labels
2015-01-24 15:06:29 +01:00
jekkos-t520
e7fd57afdf
Cleanup duplicate cookies when browsing items module
2015-01-23 00:18:43 +01:00
Malte Srocke
606eb01a67
- fixed excel import: if there was missing a location-id in the import-csv, then there would not have been created an entry into item_quantities for the item and location.
...
- fixed also the inventory info-part: before in the inventory-table there was no quantity inserted and data[10] as the location_id
2015-01-22 22:19:23 +01:00
jekkos-t520
94287ddec4
Make barcode text configurable
2015-01-21 13:14:16 +01:00
jekkos-t520
c959d97fd1
Fix for bug #39 : item with 0 stock is not listed in item-list
2015-01-19 12:02:53 +01:00
jekkos-t520
99a804c1ac
Fix item quantity after edit
2014-11-26 08:10:15 +01:00
jekkos-t520
97d37b5ad9
Merge branch 'feature/sale_numbering'
...
Conflicts:
application/libraries/Receiving_lib.php
database/2.3_to_2.3.1.sql
js/manage_tables.js
2014-11-25 17:20:05 +01:00
jekkos
90c1934d92
Merge pull request #6 from curthauta/import_items
...
fixed quantities on items import
2014-11-20 10:19:41 +01:00
Curt Hauta
8ae21bbcb7
fixed quantities on items import
2014-11-05 20:01:25 -07:00
jekkos-t520
d43015e8c9
Set default receivings value for items to 1 in database
...
Fix item quantity save
2014-11-03 18:08:57 +01:00
jekkos-t520
96c349b099
Add invoice numbering to sales module
2014-10-30 19:22:49 +01:00
jekkos-t520
9d765efc94
Add invoice number duplication check in receivings screen
...
Add invoice number duplication check in receivings detailed report
2014-10-23 18:02:33 +02:00
jekkos-t520
fe6820920b
Add edit form in detailed receivings report
...
Add language lines for detailed sale & receiving validation
Add permission for getting updated sale & receiving detail row
2014-10-21 21:39:22 +02:00
jekkos-t520
bb9ab9bd9c
Finish stock location refactoring
...
Modules are inaccessible if permissions not configured correctly
2014-10-07 21:47:07 +02:00
jekkos-t520
97ff190ba5
Receivings can now use invoice numbers with a specified format (in config section)
...
Fix some more stock location related bugs
Some refactoring todo for creating/updating stock locations
2014-10-05 22:53:42 +02:00
jekkos-t520
5e8367681b
Fix default location in items, sales and receivings
2014-10-04 13:38:52 +02:00
jekkos-t520
2929dfe9dd
Add stock location filtering on items
2014-10-02 19:33:35 +02:00
jekkos-t520
cf20194e23
Fixed sale suspending / unsuspending (adapt db scripts)
...
Cleanup old code
More code review
Update item_quantities database model (composite pk)
2014-08-07 02:07:09 +02:00
jekkos-t520
8802831831
Add foregin key constraints to stock_locations and item_quantities tables
...
Requisition options is only shown when multiple stock locations are configured
Fix stock locations config in the configuration page
Rename item_quantitys to item_quantities
Fix a missing label (need to check if present in master)
Fix display of the stock quantities in items/manage view
2014-07-25 00:15:34 +02:00
Padungsak
25fa78eedb
Add multi-stock feature
...
Finished task
1. User can add stock location in config page. Adding format is StockA,StockB,StockC for example
2. Item page, there is no more quantity column show in cert table. The quantity tracking is integrated in inventory detail
3. Receiving page, There is a stock location for user to select before receiving or returning stuff
4. Sale page, There is a stock location which is for user to select a stock location they sell from
Remain task
1. Requisition work flow
2. Language editing
3. Remove unuse code
PS
2014-07-02 11:58:08 +07:00
jekkos-t520
e1bfac5eae
requisition receipt fixed
...
database.sql script merged with current ospos one
remaining problems in reporting (sale_type to add in sales_temp query?)
data model should be refactored to allow more genericity for custom item locations (2+)
inventory tracking should be adapted to use multiple locations (instead of duplicating items for different locations)
2014-06-15 15:30:32 +02:00
jekkos-t520
6c8cea9846
Merge branch 'master' of https://github.com/pappastech/ospos into ospos
...
Fixed customer + supplier search box width + spinner position under linux
Fonts set to relative browser size
Dutch language files updated (missing labels added)
Conflicts:
WHATS_NEW.txt
application/config/autoload.php
application/config/config.php
application/config/migration.php
application/config/routes.php
application/controllers/giftcards.php
application/controllers/items.php
application/controllers/person_controller.php
application/controllers/receivings.php
application/controllers/reports.php
application/controllers/sales.php
application/controllers/suppliers.php
application/helpers/table_helper.php
application/hooks/load_config.php
application/language/english/common_lang.php
application/language/english/config_lang.php
application/language/english/customers_lang.php
application/language/english/employees_lang.php
application/language/english/error_lang.php
application/language/english/giftcards_lang.php
application/language/english/index.html
application/language/english/items_lang.php
application/language/english/login_lang.php
application/language/english/module_lang.php
application/language/english/receivings_lang.php
application/language/english/reports_lang.php
application/language/english/sales_lang.php
application/language/english/suppliers_lang.php
application/libraries/Receiving_lib.php
application/libraries/ofc-library/JSON.php
application/libraries/ofc-library/README.txt
application/libraries/ofc-library/dot_base.php
application/libraries/ofc-library/json_format.php
application/libraries/ofc-library/ofc_area_base.php
application/libraries/ofc-library/ofc_area_hollow.php
application/libraries/ofc-library/ofc_area_line.php
application/libraries/ofc-library/ofc_arrow.php
application/libraries/ofc-library/ofc_bar.php
application/libraries/ofc-library/ofc_bar_3d.php
application/libraries/ofc-library/ofc_bar_base.php
application/libraries/ofc-library/ofc_bar_filled.php
application/libraries/ofc-library/ofc_bar_glass.php
application/libraries/ofc-library/ofc_bar_sketch.php
application/libraries/ofc-library/ofc_bar_stack.php
application/libraries/ofc-library/ofc_candle.php
application/libraries/ofc-library/ofc_hbar.php
application/libraries/ofc-library/ofc_line.php
application/libraries/ofc-library/ofc_line_base.php
application/libraries/ofc-library/ofc_line_dot.php
application/libraries/ofc-library/ofc_line_hollow.php
application/libraries/ofc-library/ofc_line_style.php
application/libraries/ofc-library/ofc_menu.php
application/libraries/ofc-library/ofc_pie.php
application/libraries/ofc-library/ofc_radar_axis.php
application/libraries/ofc-library/ofc_radar_axis_labels.php
application/libraries/ofc-library/ofc_radar_spoke_labels.php
application/libraries/ofc-library/ofc_scatter.php
application/libraries/ofc-library/ofc_scatter_line.php
application/libraries/ofc-library/ofc_shape.php
application/libraries/ofc-library/ofc_sugar.php
application/libraries/ofc-library/ofc_tags.php
application/libraries/ofc-library/ofc_title.php
application/libraries/ofc-library/ofc_tooltip.php
application/libraries/ofc-library/ofc_x_axis.php
application/libraries/ofc-library/ofc_x_axis_label.php
application/libraries/ofc-library/ofc_x_axis_labels.php
application/libraries/ofc-library/ofc_x_legend.php
application/libraries/ofc-library/ofc_y_axis.php
application/libraries/ofc-library/ofc_y_axis_base.php
application/libraries/ofc-library/ofc_y_axis_label.php
application/libraries/ofc-library/ofc_y_axis_labels.php
application/libraries/ofc-library/ofc_y_axis_right.php
application/libraries/ofc-library/ofc_y_legend.php
application/libraries/ofc-library/open-flash-chart-object.php
application/libraries/ofc-library/open-flash-chart.php
application/models/giftcard.php
application/models/item.php
application/models/person.php
application/models/receiving.php
application/models/sale.php
application/models/supplier.php
application/views/config.php
application/views/items/form.php
application/views/items/form_bulk.php
application/views/items/manage.php
application/views/receivings/receiving.php
application/views/reports/date_input.php
application/views/reports/listing.php
application/views/reports/tabular_details.php
application/views/sales/edit.php
application/views/sales/register.php
application/views/suppliers/form.php
css/reports.css
css/tables.css
database/database.sql
import_items.csv
index.php
js/jquery.ajax_queue.js
js/jquery.metadata.js
license/license.txt
2014-03-03 22:19:14 +01:00
jekkos-t520
ee89f1971b
Deleted sales can be shown again under items
...
Language folders renamed + fix for loading them
Added smoe translations to the nl-BE language
Autoload settings adapted
2014-02-27 23:43:37 +01:00
pappastech
f54ce7e1df
Initial commit
2014-02-25 17:34:25 -05:00
objecttothis
d096028eb6
These commits affect the various controllers. They all have dependencies on other commits.
...
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@60 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-07-05 20:07:34 +00:00
