FrancescoUK
404bc47e96
#132 Added date picker to Items manage, added date range to controller + model
2015-09-22 18:38:19 +01:00
FrancescoUK
461de2f048
#162 fix further issues due to cost & retail prices added to the table
2015-09-19 15:23:16 +01:00
FrancescoUK
dc45b77573
Fix to Gift card totals issue #159
...
Various indentation adjustments
2015-09-19 09:22:24 +01:00
FrancescoUK
d5cf608bac
Fix to #152 remove name of people from code comment and add them to COPYING license file
2015-09-18 18:33:22 +02:00
FrancescoUK
96973da280
Item kits issue #155 fix
...
Added Kit Id column to table view
2015-09-18 18:33:22 +02:00
FrancescoUK
10ea821b2a
Leave item_number empty if Code39/128 is selected
...
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
2015-09-15 17:49:51 +01:00
jekkos
b680cdff36
Fix table sorting after loading search results
2015-09-07 08:35:59 +02:00
jekkos
517363b485
Fix deleted checkbox in items form
...
Clear suggestion cache when toggling deleted filter
2015-08-18 18:10:00 +02:00
jekkos
011caf375f
Apply is_deleted in item suggestion search
2015-08-18 08:35:21 +02:00
jekkos
69528baa21
Merge pull request #60
...
Update common_lang.csv
Spanish translation to CSV files. Spanish translation updated - xepaez 20150424
Added translation labels missing in CSV import forms.
2015-04-27 19:07:28 +02:00
jekkos
9b1785df01
Correct obvious punctuation error in item form.php
2015-04-27 19:07:28 +02:00
jekkos
c6d9a8a994
Show correct quantity in item form
...
invert ternary condittions to show correct quantity at any time
2015-04-27 19:07:28 +02:00
jekkos
70bb02c753
Change button order (default is submit now)
2015-04-06 15:45:49 +02:00
jekkos
f45f75e458
Add functionality to keep item edit form open for easier working (in
...
sales, receivings and items module)
Refactor duplicated custom field code in item form
2015-04-06 15:15:40 +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
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
bd54a180d5
Remove location field from bulk edit
2015-02-24 08:55:44 +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
0f77300131
Sales overview added to register screen
...
Add pagination to default search routine
Remove payment_type column from sales table (was redundant)
Fix search spinner location (just toggle ac_loading class)
Complete sale labels
2015-02-20 15:54:13 +01:00
jekkos-t520
b7751bde1a
Fix serialized search filter in items module
2015-02-11 12:19:32 +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
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
941ff4cd4a
Upgrade jquery form to 3.51
...
Make item_number field non required
Save item_number properly
2015-02-07 20:22:21 +01:00
jekkos-t520
8fd315e389
Fix error message styling + add UPC required error message in items_lang
2015-02-06 17:28:49 +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
707114805d
Fix autocomplete problem with new item in sales module
2015-02-06 15:48:57 +01:00
jekkos-t520
c7280e6018
Minor code review
2015-02-05 17:26:27 +01:00
jekkos-t520
ec6455647f
Merge branch 'feature/item_pics'
...
Conflicts:
database/2.3_to_2.3.1.sql
database/database.sql
translations/items_lang.csv
2015-02-05 17:05:51 +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
1bf839601a
Barcode patch applied (using barcodegen)
2015-02-02 12:44:58 +01:00
jekkos-t520
7a46078734
Add receivings_quantity to item form
...
Conflicts:
application/libraries/Receiving_lib.php
database/2.3_to_2.3.1.sql
2014-11-03 18:07:50 +01:00
jekkos-t520
2929dfe9dd
Add stock location filtering on items
2014-10-02 19:33:35 +02:00
jekkos-t520
e43f7ac7bb
Add deleted checkbox filter in items page (was remove due to wrong merge)
2014-09-10 19:03:19 +02:00
jekkos-t520
ed15532cc4
Merge branch 'merge/padungsak'
...
Conflicts:
database/database.sql
2014-08-17 01:22:12 +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
a1e1883ddc
Add quantity column in item page
...
Fix bug about validating stock location config
PS
2014-07-11 22:32:47 +07: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
015392c8b7
Add delete checkbox to item form view
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@104 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-01 20:46:37 +00: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
f6e5ae3d12
Fix barcode generation for receiving receipts
...
Minor code cleanup in items management javascript
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@97 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-03-19 23:29:19 +00: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
a6b76ac71f
Changes to items
...
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@70 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-07-05 20:14:45 +00:00
