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
b1f1feda48
Show alternative description on invoice only if not empty
2015-07-01 08:29:53 +02:00
jekkos
48fe4aa4cf
Show item alternative description if available
...
Show sale instead of customer comments on invoice
2015-06-30 23:08:56 +02:00
jekkos
0788f4eef9
Set precision to 5 decimals (constants.php)
...
Show item description if serialized (invoice.php)
2015-06-28 14:20:39 +02:00
jekkos
fc5f097820
Add proper validation for module grants (issue #87 )
2015-06-23 23:32:56 +02:00
jekkos
df7907fb8f
Don't lose date precision when editing sale or receiving
...
Extend date validator to allow timestamps as well (sale + receiving)
Fix receiving edit
2015-06-20 20:58: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
5c1ecf4618
Update .gitattributes with merge strategy for specific files
2015-05-25 13:28:03 +02:00
jekkos
ccc2af2a26
Show tax exclusive subtotal in case of tax inclusive pricing
2015-05-23 16:51:42 +02:00
jekkos
872d6857cd
Add decent delay for waitForElement in wd test
2015-05-22 23:29:25 +02:00
jekkos
658792c1fc
Fix invoice return
2015-05-22 19:26:56 +02:00
jekkos
4a324fbf4c
Fix inventory update on deleting sale (issue #80 )
2015-05-22 19:26:56 +02:00
jekkos
97d268e323
Tax summary report calculation fixes
2015-05-22 07:54:07 +02:00
jekkos
ca05583ec3
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-05-21 22:12:50 +02:00
jekkos
7d0a6dc7ae
Merge branch 'feature/travis-ci'
2015-05-21 22:12:30 +02:00
jekkos
3ba3a3dea0
Merge branch 'travis-ci-setup'
...
Conflicts:
test/login.js
2015-05-21 22:10:28 +02:00
jekkos
1ad08c014f
Fix giftcard numbering issue #65
2015-05-21 22:00:33 +02:00
jekkos
3936f2dcf3
Add giftcard numbering test
2015-05-20 18:35:10 +02:00
jekkos
fcc71a5f74
Sale reporting now takes tax inclusive pricing into account
2015-05-19 22:44:03 +02:00
jekkos
46f6824199
Fix rounding issues with tax inclusive pricing
...
Add autocomplete in return mode
2015-05-19 20:46:42 +02:00
jekkos
7c0f884872
Remove trailing space (issue #76 )
2015-05-19 09:40:30 +02:00
jekkos
15493ae58e
Set correct url
2015-05-17 22:36:00 +02:00
jekkos
ac7c0241e5
Merge pull request #79 from nalamapu/patch-1
...
Update general_config.php
2015-05-17 21:44:32 +02:00
A.K.M. Nurul Alam
fd933e3ed6
Update general_config.php
...
'Comma' is the original spelling in English.
2015-05-16 12:14:21 +06:00
jekkos
6a2a5278b8
Fix general test setup (finally)
...
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
2015-05-15 00:47:25 +02:00
jekkos
687d4c06c6
Fix general test setup (finally)
...
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
2015-05-15 00:45:55 +02:00
jekkos
19f7c6aa57
Initialize mysql on travis
2015-05-13 00:14:11 +02:00
jekkos
ccf1a6209f
Set travis.yml language to php (node should be default)
2015-05-12 23:44:43 +02:00
jekkos
4db6f28c76
Try to fix php-fpm absence (3)
2015-05-12 22:26:37 +02:00
jekkos
3e08ec99a5
Try to fix php-fpm absence (2)
2015-05-12 13:59:08 +02:00
jekkos
4142f0fc71
Try to fix php-fpm absence
2015-05-12 13:53:16 +02:00
jekkos
1d9a0bc8b6
Add travis-ci-apache
2015-05-12 13:52:32 +02:00
jekkos
a58510c541
Add apache2 + mysql setup for travis
2015-05-12 13:46:34 +02:00
jekkos
b2a37b7ded
Add category column again
2015-05-01 12:11:49 +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
c5defaab35
Empty person_id field in giftcard edit if id is null
2015-04-27 19:07:28 +02:00
jekkos
af7910a6a8
Show giftcard number instead of id in edit form
2015-04-27 19:07:28 +02:00
jekkos
86eb397866
Enable sorting on giftcard number
...
Add default stock permissions for sales and receivings in upgrade script
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
8f09a32ef5
Correct latest alter table statements for
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
54855849b3
Show item number in order report
...
Conflicts:
application/controllers/reports.php
database/database.sql
2015-04-27 19:07:28 +02:00
jekkos
7a9590359e
Fix currency symbol when no dollars are chosen
2015-04-27 19:07:28 +02:00
jekkos
11eed40718
Update receivings.php
...
clear invoice number when changing receive mode
2015-04-27 19:07:28 +02:00
jekkos
bc7eeb5d30
Do not clear session state when switching sale or receiving modes
...
Set receiving quantity and discount validation to numeric instead of
integer
2015-04-27 19:07:27 +02:00
jekkos
c85dd1660e
Add .idea folder to .gitignore
2015-04-13 18:21:15 +02:00
jekkos
08c0c2c63f
Giftcard remaining balance is always shown in cash register
...
Giftcard person_id is optional now
Add some extra translations for giftcard warnings
Conflicts:
database/2.3.1_to_2.3.2.sql
2015-04-09 18:28:57 +02:00
jekkos
81c24d7151
Do not clear sale and receiving libs when switching modes
2015-04-09 18:28:57 +02:00
jekkos
3d62a73c8c
Report subpermission labels are shown properly in employee form now
...
Fix logic to show correct report subpermissions
2015-04-09 18:28:53 +02:00
jekkos