mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-06-15 02:57:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
882 Commits 45 Branches 39 Tags
3156ce217b404cee6fb52a36ec5dc172e241ff4e
Commit Graph

67 Commits

Author SHA1 Message Date
FrancescoUK
d788320a9d Tidy up js in Sales/manage and Items/manage, commented out invoice js part as not used (#116) 2016-02-14 19:42:08 +00:00
jekkos
d003239525 Items form bootstrapified (working in Chrome) (#116, #328) 2016-02-13 14:42:01 +01:00
jekkos
45cb6bc4f7 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-02-13 14:14:40 +01:00
FrancescoUK
8438942b10 use bootstrap-datetimepicker instead of jquery-ui-timepicker-addon in Items and Takings (#116) 
There is an issue with Takings filtering that needs fixing and also arrows are not showing in the datetimepicker.
 2016-02-13 12:29:15 +00:00
jekkos
2be22d8e48 Migrate thickbox in items to bootstrap modal dialog (#328) 2016-02-13 13:17:29 +01:00
FrancescoUK
7e269f1256 Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116) 2016-02-08 19:30:26 +00:00
FrancescoUK
d5e0230b19 Change button styles to use bootstrap standard, other fixes in style.css (#116) 2016-02-08 10:25:06 +00:00
FrancescoUK
25f8a34b23 Change buttons in all the forms to use bootstrap button class (#116) 2016-02-07 23:04:59 +00:00
FrancescoUK
dce413631c Make NULL to be null all over the code for consistency purposes (#120) 2016-01-16 22:08:43 +00:00
jekkos
4ddde65b41 Bump version to 2.3.4 
Update dutch translation for company_name
Fix timeformat for date filtering in items module
 2016-01-07 19:53:52 +01:00
jekkos
fb924daa81 Show reoder level in items form when editing (#241) 2015-12-04 18:13:05 +01:00
jekkos
bc85391734 Submit form when hitting enter in search field for items module (#187) 2015-11-09 11:15:42 +01:00
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