jekkos-t520
ade913f0e4
Merge github pull request #30
2015-02-11 16:31:31 +01:00
Martes Erede
927dbbabb6
Feature #27 : Changing cost price while receiving items
2015-01-24 21:40:07 +01:00
Malte Srocke
7544aae394
Bug #25 : Deleting a sale/receiving would not effect the stock/quantity.
2015-01-24 19:44:19 +01:00
jekkos-t520
0f34a6ace4
Ignore receiving_quantity = 0 for receivings
2014-12-26 11:39:26 +01:00
jekkos-t520
c00c604c21
Fix tax inclusive pricing for non taxable customer
...
Show receiving quantity in receiving receipt
Allow to use invoice number as zero (a bug prevented 0 to be saved to
db, causing it to stop incrementing next time)
2014-12-18 19:55:20 +01:00
jekkos-t520
094a293c78
Fix invoice number insert in receivings
2014-11-06 07:35:54 +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
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
bac80e3a92
Added invoice_number field to receivings table
...
Save comments field in receivings as in sales
Add translations for cancel button in receivings
Add cascading deletes for ospos_permissions
2014-10-04 13:19:24 +02:00
jekkos-t520
ed15532cc4
Merge branch 'merge/padungsak'
...
Conflicts:
database/database.sql
2014-08-17 01:22:12 +02:00
jekkos-t520
e53265cca8
Requisition is now registered as receiving for destination stock and return for source stock
...
Remove specific requisition report and code
Adapt receivings report to show requisitions in a generic way
2014-08-07 12:50:42 +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
jekkos
3838147bb9
All database types used in amount calculations changes to decimal(15,2)
...
Removed round() statements in sale temp table, precision is defined by datatypes
Removed round() statement in receiving temp table, precision is defined by datatypes
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@105 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-04 21:01:47 +00: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
pappastech
f54ce7e1df
Initial commit
2014-02-25 17:34:25 -05: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
