mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-18 00:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
950 Commits 50 Branches 39 Tags
69fedb371246ca4286a487bdf965ff6affef9727
Commit Graph
50 Commits
Author SHA1 Message Date
FrancescoUK 69fedb3712 bootstrapify inventory form (#116) 2016-02-28 17:08:30 +00:00
FrancescoUK d96fafa92f remove redundant title strings from all the forms (#116) 
The dialog box has already a title and there is no need to double the subject.
 2016-02-28 14:21:05 +00:00
FrancescoUK c0a048251e fix silly 1px drop with glyphicons in front of input, various beautifications: more icons and better tables in suspended and item_kits (#116) 2016-02-28 11:55:11 +00:00
jekkos 99c92e68a6 Add glyphicon to form fields in customer and item (#116) 2016-02-28 01:18:40 +01:00
FrancescoUK 0dce125f67 fix controls sizes in all the forms, fix datetimepicker in sales/form and receiving/form, fix item_kits/form (#116) 2016-02-27 21:55:52 +00:00
jekkos 4a68ab13e1 Bootstrapify sales and receivings forms (#116) 2016-02-27 20:01:00 +01:00
jekkos 7769334372 Add close button by default (#116, #361) 2016-02-26 19:08:49 +01:00
jekkos 959f7da876 Fix item form submission + remove invalid char before value attribute 2016-02-26 11:05:55 +01:00
jekkos a9902219ae Continue bootstrapification (item bulk edit, bootstrap modals) 
(#116, #361)
Remove get_form_width() from controllers, add new class to define modal width
Add bootstrap validation markup to edit forms
 2016-02-25 23:31:43 +01:00
jekkos fcf303b2b3 Finish form bootstrapification for config module 2016-02-22 23:38:46 +01:00
jekkos d2a11cdb91 Bootstrappify config forms - WIP (#116) 2016-02-18 23:30:21 +01:00
jekkos 808943f250 Add bootstrap form style to item kits, suppliers, giftcards, and excel import in 
items and customers (#118)
Fix dialog submission in all pages (#328)
 2016-02-18 08:57:17 +01:00
jekkos 82a3f9a3e2 Add new dialogs to all pages (use modal-dlg class) #116 
Bootstrapify customer edit form (almost done)
Bootstrapify item excel impor
 2016-02-17 23:34:53 +01:00
jekkos c99ef3f315 Bootstrapify item edit form (#116) 
Use bootstrap-dialog in items inventory and inventory details (#328)
 2016-02-16 23:42:20 +01:00
jekkos a97929f239 Remove thickbox from bower.json (#328) 
Items edit working now (items module only) (#116)
 2016-02-16 21:41:02 +01:00
jekkos d003239525 Items form bootstrapified (working in Chrome) (#116, #328) 2016-02-13 14:42:01 +01: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 fb924daa81 Show reoder level in items form when editing (#241) 2015-12-04 18:13:05 +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
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-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 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 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 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-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
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
pappastech ecdf3a5aa1 Version 2.0_RC1. Upgrade to CI 2.1.0. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@24 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:16:01 +00:00
pappastech 335982638e Upgrading to CI 2.1.0 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@23 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:11:50 +00:00
pappastech b089d5b73f Initial commit of release 1.0. 
~ Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@5 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-06-08 13:21:52 +00:00