jekkos
|
ca05583ec3
|
Merge branch 'master' of https://github.com/jekkos/opensourcepos
|
2015-05-21 22:12:50 +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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
27c6f275d1
|
Set focus to scan field when refreshing receivings module
|
2015-04-06 15:13:42 +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
|
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 |
|
jekkos
|
cae9d3b67e
|
Remove tags:css task in Grunfile (css files are imported the old way
again)
Fix sale delete confirmation in edit dialog
Add bower.json (still unused)
Fix autogenerated javascript load order
|
2015-03-17 16:47:49 +01:00 |
|
jekkos-t520
|
aa65593ce3
|
Add Gruntfile.js for concat+uglification of javascript
Enable debug=true cookie for full source inclusion in header.php
Add template in header.php to inject generated javascript files
|
2015-03-15 16:56:37 +01:00 |
|
jekkos-t520
|
a39e12e76d
|
Externalize nominatim autcomplete functionality
Add chosen language to nominatim request
|
2015-03-10 14:37:36 +01:00 |
|
jekkos-t520
|
b29cb85b9b
|
Add ticket suggestions for #40
|
2015-03-07 22:41:03 +01:00 |
|
jekkos-t520
|
6faaec53d6
|
Fix duplicate item suggestion issue #38
Fix return ticket suggestion issue #38
Fix discounted_total after hitting edit in sales register
|
2015-03-07 21:55:15 +01:00 |
|
jekkos-t520
|
b29ec8ef31
|
Fix show discounts functionality
Review tax price calculations
Remove tax exclusive price in invoice.php template
|
2015-03-07 19:35:13 +01:00 |
|
jekkos-t520
|
4ac1a943eb
|
Update totals calculation
Update tax inclusive calculation
|
2015-03-06 00:58:44 +01:00 |
|
jekkos-t520
|
0e357f14f6
|
Add option to show total discounts on receipt
|
2015-03-05 08:28:58 +01:00 |
|
jekkos-t520
|
e0fd35220e
|
Add custom search back into items
Fix proper pagintaion for filtered item views w/o search
|
2015-03-04 20:53:38 +01:00 |
|
jekkos-t520
|
ffb8501276
|
Fix custom search
|
2015-02-27 16:03:52 +01:00 |
|
jekkos-t520
|
b2f76f3fe6
|
Improve thai translation (Merge Pull Request #20)
Improve login screen
|
2015-02-26 21:55:55 +01:00 |
|
jekkos-t520
|
b02b16b63e
|
Only show company name in supplier's dropdown
|
2015-02-25 13:30:18 +01:00 |
|
jekkos-t520
|
81cb46bb8b
|
Add router for sales overview
|
2015-02-25 13:30:18 +01:00 |
|
jekkos-t520
|
b11bf919af
|
Automatically resize report columns
Remove text-transform for invoice header
|
2015-02-25 13:30:17 +01:00 |
|