Commit Graph

72 Commits

Author SHA1 Message Date
jekkos-t520
b5c33b4fcb Add $YCO parameter (invoice numbering per year) 2015-02-12 15:19:57 +01:00
jekkos-t520
ade913f0e4 Merge github pull request #30 2015-02-11 16:31:31 +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
3594c348ee Fix stock location permissions for github issue #34 2015-02-10 16:04:52 +01:00
jekkos-t520
c40ad31ed0 Review item import (check item_number and throw proper error) 2015-02-10 15:43:10 +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
7c24682584 Fix stock location removal 2015-02-02 16:55:26 +01:00
jekkos-t520
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +01:00
Martes Erede
4ddec66d7b #27 Using bc-style operations now. 2015-01-29 16:22:44 +01:00
jekkos-t520
08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00
jekkos-t520
f323bec9ca Merge branch 'refactor/edit_stock_locations'
Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
2015-01-27 19:24:59 +01:00
jekkos-t520
24a6c9c34f Config location editing works now 2015-01-27 19:03:57 +01:00
jekkos-t520
8705b91bd3 Start refactoring the stock locations configuration screen 2015-01-26 08:11:21 +01:00
jekkos-t520
b9ee7b6b01 Invert quantity correction when deleting sales 2015-01-25 16:07:53 +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
Malte Srocke
606eb01a67 - fixed excel import: if there was missing a location-id in the import-csv, then there would not have been created an entry into item_quantities for the item and location.
- fixed also the inventory info-part: before in the inventory-table there was no quantity inserted and data[10] as the location_id
2015-01-22 22:19:23 +01:00
jekkos-t520
dd369118c5 Add check payment type to temp sales table again 2015-01-16 18:43:38 +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
efff9d20c1 Add giftcard number autogeneration 2014-12-16 18:36:26 +01:00
jekkos-t520
07a32a0deb Remove invoice / sale format enable option
Add giftcards -> person_id foreign key constraint
Fix tax calculation for non taxable customers
Improve giftcard person autocompletion
2014-12-16 08:49:49 +01:00
jekkos-t520
1c1b89db21 Fix detailed sales report for sale_type = sale 2014-12-04 08:49:36 +01:00
jekkos-t520
d7a61080e2 Add duplicate invoice number error message in sales module
Fix colspan width for receivings (one column was added for
receiving_quantity)
2014-11-26 21:56:18 +01:00
jekkos-t520
094a293c78 Fix invoice number insert in receivings 2014-11-06 07:35:54 +01:00
jekkos-t520
3007173833 Add invoice numbering to sales module 2014-10-31 07:58:46 +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
868de15fcb Invoice number is now substituted correctly after complete
Fix payments summary report
Update upgrade script (not tested yet)
2014-10-13 12:30:37 +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
ac667a23dc Refactor report listing (again)
All reports have proper permissions now (categories, taxes, discounts,..)
Minor refactoring and code cleanup
2014-10-12 02:54:54 +02:00
jekkos-t520
54fbb4e7d7 Refactor stock location save
Add config to permissions and grants in database script
2014-10-11 17:55:00 +02:00
jekkos-t520
cda41622e4 Merge branch 'refactor/module_permissions' into feature/invoice_numbering
Conflicts:
	database/database.sql
2014-10-10 16:38:07 +02:00
jekkos-t520
802a0e6a59 Refactor report listing (move sales specific grants to employee model) 2014-10-09 17:56:24 +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
a1eb735d96 Remove empty check for item_id and quantity_id when saving item_quantities
Add configuration key to database script
2014-10-07 08:27:31 +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
1afbc03304 Merge branch 'feature/multistore_support' into feature/invoice_numbering 2014-10-04 16:49:22 +02:00
jekkos-t520
5e8367681b Fix default location in items, sales and receivings 2014-10-04 13:38:52 +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
5a4ac8dde3 Fix comments in receivings 2014-10-03 17:41:39 +02:00
jekkos-t520
eb51b680aa Show stock location names in employee form 2014-10-03 00:27:50 +02:00
jekkos-t520
2929dfe9dd Add stock location filtering on items 2014-10-02 19:33:35 +02:00
jekkos-t520
290533612e Fix submodules in header 2014-09-29 21:06:06 +02:00
jekkos-t520
5cf73130c5 Modules are not accessible if employee has no permissions on at least one of it's submodules
Some more db script modifications
2014-09-23 19:14:25 +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
jekkos-t520
ed15532cc4 Merge branch 'merge/padungsak'
Conflicts:
	database/database.sql
2014-08-17 01:22:12 +02:00