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
|
b8fba91244
|
Show tax names and amounts in invoice and invoice_email views
Fix invoice numbering for $YCO after update
|
2015-04-09 18:28:23 +02:00 |
|
jekkos
|
80dbe6efa7
|
Company name can be DEFAULT NULL in database
|
2015-04-09 07:18:50 +02:00 |
|
jekkos
|
3f46f1aca9
|
Merge branch 'master' of https://github.com/jekkos/opensourcepos
|
2015-04-08 21:56:18 +02:00 |
|
jekkos
|
26fddcf8d4
|
Add custom repository for grunt-script-link-tags
|
2015-04-08 13:47:16 +02:00 |
|
jekkos
|
7a4df2a050
|
Fixup db script
|
2015-04-07 19:13:45 +02:00 |
|
jekkos
|
de3d7ce726
|
Add new language line for check_remainder
|
2015-04-07 19:10:46 +02:00 |
|
jekkos
|
4ffc5351af
|
Add customer as a required field for giftcard
Show giftcard remainder if at least one payment is done using giftcard
|
2015-04-07 17:28:44 +02:00 |
|
jekkos
|
3f14c51c97
|
Update travis.yml
|
2015-04-06 16:55:46 +02:00 |
|
jekkos
|
e9b4e57c06
|
Add company_name column to ospos_customers
|
2015-04-06 15:47:38 +02:00 |
|
jekkos
|
70bb02c753
|
Change button order (default is submit now)
|
2015-04-06 15:45:49 +02:00 |
|
jekkos
|
6f7090d7ba
|
Upgrade jquery.color
Conflicts:
dist/opensourcepos.js
dist/opensourcepos.min.js
|
2015-04-06 15:42:57 +02:00 |
|
jekkos
|
43ecda44e0
|
Receipt totals layout improvement (show top border when no discount or
tax section present)
Remove unexistant script include from invoice_email template
|
2015-04-06 15:38:52 +02:00 |
|
jekkos
|
04abb716fa
|
Merge branch 'master' of https://github.com/jekkos/opensourcepos
Conflicts:
dist/opensourcepos.min.js
|
2015-04-06 15:16:43 +02:00 |
|
jekkos
|
95ae2766cd
|
Giftcard get_all parameters were in opposite order
Invoice layout improvements
|
2015-04-06 15:15:40 +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
|
ebd473ea11
|
Update README.md
Add build status to Readme.md
|
2015-04-06 15:15:20 +02:00 |
|
jekkos
|
7d7ee83ef4
|
Add test folder + basic unit test setup
Add grunt mochaWebdriver plugin for phantomJs test
Conflicts:
.travis.yml
dist/opensourcepos.min.js
|
2015-04-06 15:15:14 +02:00 |
|
jekkos
|
27c6f275d1
|
Set focus to scan field when refreshing receivings module
|
2015-04-06 15:13:42 +02:00 |
|
jekkos
|
39edf5ccdb
|
Add basic unit tests
|
2015-04-06 15:13:36 +02:00 |
|
jekkos
|
90c4df7f2a
|
Update README.md
Add build status to Readme.md
|
2015-04-01 00:01:19 +02:00 |
|
jekkos
|
ae99555fec
|
Add test folder + basic unit test setup
Add grunt mochaWebdriver plugin for phantomJs test
|
2015-03-31 23:58:05 +02:00 |
|
jekkos
|
8ff742085a
|
Multiple total disconuts are shown correctly now
|
2015-03-31 21:56:44 +02:00 |
|
jekkos
|
86bf8866f0
|
Do duplicated cookie check before echo'ing output in items (fix for #49)
|
2015-03-31 16:33:29 +02:00 |
|
jekkos
|
a8f353de9c
|
Add constraint for trans_location foreign key
Use Code128 for receipt barcodes in sales and receivings
|
2015-03-31 15:05:30 +02:00 |
|
jekkos
|
9b98f15f69
|
Receiving cancel delete should work now (confirm result was ignored)
receivings_items will now store the correct quantity_purchased when
using a value > 1 for receiving_quantity
Receiving delete message corrected
|
2015-03-30 16:37:26 +02:00 |
|
jekkos
|
138d1cbeef
|
Remove duplicated click handlers on add/remove location
|
2015-03-26 13:00:08 +01:00 |
|
jekkos
|
9ead6fcca9
|
Add mochaSelenium config in Gruntfile (tests not running yet)
|
2015-03-20 13:50:14 +01:00 |
|
jekkos
|
ced5ca4e2e
|
Make invoice numbers more consistent
|
2015-03-17 18:05:43 +01:00 |
|
jekkos
|
ca2c9a6ae4
|
Item refresh fix for issue #42
Invoice number in email message are denoted with $INV
Sale id's in email message are denoted with POS $sale_id
|
2015-03-17 17:41:12 +01:00 |
|