mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-19 23:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
640 Commits 37 Branches 40 Tags
76365afbd254d94d9aaacc10ca01acaa4531a321
Commit Graph

40 Commits

Author SHA1 Message Date
jekkos
e1ddcbbb5b Rename Item_quantities model to Item_quantity 
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
 2015-09-17 21:59:33 +02:00
Martes Erede
4cbbd3a6f7 [#32] using to_currency for currency values in table-data 2015-09-11 16:16:34 +08:00
Martes Erede
308be8079f [#32] improving the inventory summary report, including total inventory value 2015-09-11 15:58:57 +08:00
FrancescoUK
9f1485cfe5 Added Cost & Count to reports, improved Items suggest, added copyrights and some fixes 
Added cost and count to reports

- Added cost in temp table, reports at bottom of page and in each
summary and detailed report
- Added count in all the reports
- Renamed some report fields name to make it generic and consistent
across views
- Fixed few issues here and there
- Adjusted some code indentation

NOTE: Proper translation of word Cost is required in all the languages
but English

Improved Items suggestion

- Added select to restrict results fields
- Added distinct in suppliers instead of the array match
- Added $is_deleted in model part but is not still effective

Add copyright statements in COPYING license file

- Added jekkos and FrancescoUK / daN4cat

Other people that contributed should add their statements.
 2015-08-17 11:13:04 +01:00
FrancescoUK
8bcd2a69dc Add better locale config support (pull request #93) 
I've added in this commit the following:

- the means to configure date and time format
- date and time is shown with the selected formats
- a locale tab in the configuration page
- changed location tab to be stock tab and the same for the file names
- translation strings (only English) for the case

NOTE 1: Not related to Locale support but I removed an extra <div
class="field_row clearfix"> from general_config.php

NOTE 2: There is no rules in the submit checks of Locale. Probably this
is something to iron out a bit

NOTE 3: It would be probably nice to add a button in the Locale tab to
regenerate all the translation files in case somebody updates the
translations .csv

Fixed Local config

- Removed text in Red as really not mandatory configuration
- Added time format in 24h and 12h

Updated General Config tab

- reorganised the layout grouping things like company info, taxes and
invoice formating
- increased the limit of max lines per page to 1000 because 50 is too
little. People can do what they want with up to 1000
 2015-07-25 12:02:10 +02:00
jekkos
e0f80528f4 Fix report generation regression 2015-07-15 18:14:58 +02:00
jekkos
491d8d0b72 Increase testcase delays 
Keep keys order when reversing array for stock location options
 2015-07-14 18:17:54 +02:00
jekkos
92da2749ad Adapt report summary to chosen stock location 
Update release notes
 2015-07-13 18:39:50 +02:00
jekkos
83a297cf15 Add stock location as filter to detailed sales + receivings reports 2015-07-10 19:04:52 +02:00
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
46b5c18aca Add receiving_quantity field to ospos_receivings (issue #78) 
Detailed receiving now correctly shows purchased quantity
 2015-06-20 14:59:37 +02:00
jekkos
54855849b3 Show item number in order report 
Conflicts:

	application/controllers/reports.php
	database/database.sql
 2015-04-27 19:07:28 +02:00
jekkos-t520
b11bf919af Automatically resize report columns 
Remove text-transform for invoice header
 2015-02-25 13:30:17 +01:00
jekkos-t520
40ebba4252 Improve table layout a bit (change header sizes) 2015-02-25 13:30:17 +01:00
jekkos-t520
cb1075e6c0 Remove sale_type parameter from get_detailed_sales and 
get_detailed_receivings methods
 2015-02-24 10:22:19 +01:00
jekkos-t520
ee30b178b4 Remove duplicate statement from 2.3.1 sql upgrade script 
Remove quantity column from database.sql
Update item import example with correct location id
Fix detailed report receipt links
 2014-11-28 08:51:08 +01:00
jekkos-t520
44b5404fe7 Fix missing invoice number in sales receipt 2014-11-27 08:48:15 +01:00
jekkos-t520
78ca94e036 Fix detailed report editing 2014-11-27 08:44:50 +01: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
31877528b1 Security update for report subpermissions 2014-10-17 08:29:46 +02:00
jekkos-t520
7fad710277 Reports module now has checks on the required submodules when entering direct urls 2014-10-16 18:31:35 +02:00
jekkos-t520
0863b4ebba Add extra permissiosn checks to report methods 
Adapt no_access page to show missing grant
Adapt Email library to customize return_path header
 2014-10-16 08:20:36 +02:00
jekkos-t520
de06b64e4e Fix warning in specific discount report (add category to query) 
Add grant for default stock location in sql
 2014-10-12 03:18:19 +02:00
jekkos-t520
77222c1989 Fix supplier selection 2014-10-08 19:27:07 +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
aee5f3d27e Add ospos_grants table 
Refactor permission and module system
 2014-10-07 00:47:30 +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
290533612e Fix submodules in header 2014-09-29 21:06:06 +02:00
jekkos-t520
13127c4dc7 Deny access to report submodules on which employee doesn't have permissions 2014-09-24 08:47:00 +02:00
jekkos-t520
4b16b68f24 Added more granular permissions for report module 
Extend permission system to allow 'submodule' permissions
Add permissions for stock locations (multistore support)
 2014-09-22 20:41:53 +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
bae6f10d7d Added edit/delete functionality in detailed sales report 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@95 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-17 16:29:13 +00:00
jekkos
174538f733 Merge with svn repository 
Conflicts:
	application/language/dutch/index.html
	application/language/en/form_validation_lang.php
	application/language/en/sales_lang.php
	application/language/id/form_validation_lang.php
	application/language/nl-BE/index.html
	application/language/ru/form_validation_lang.php
	application/views/config.php
	system/language/Azərbaycanca/index.html
	system/language/en/calendar_lang.php
	system/language/en/date_lang.php
	system/language/en/db_lang.php
	system/language/en/email_lang.php
	system/language/en/ftp_lang.php
	system/language/en/imglib_lang.php
	system/language/en/index.html
	system/language/en/migration_lang.php
	system/language/en/number_lang.php
	system/language/en/profiler_lang.php
	system/language/en/unit_test_lang.php
	system/language/en/upload_lang.php
	system/language/nl-BE/index.html

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@93 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-10 22:01:18 +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
pappastech
f54ce7e1df Initial commit 2014-02-25 17:34:25 -05:00
jekkos
490ce59bbb Add specific discount report 2013-11-16 14:32:39 +01: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