Commit Graph

244 Commits

Author SHA1 Message Date
FrancescoUK
d5cf608bac Fix to #152 remove name of people from code comment and add them to COPYING license file 2015-09-18 18:33:22 +02:00
FrancescoUK
96973da280 Item kits issue #155 fix
Added Kit Id column to table view
2015-09-18 18:33:22 +02:00
FrancescoUK
2b7ceb4228 Move Print button in sale/manage (Takings) to top right 2015-09-17 21:59:33 +02:00
FrancescoUK
10ea821b2a Leave item_number empty if Code39/128 is selected
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
2015-09-15 17:49:51 +01:00
FrancescoUK
8f2740d349 Centred barcode image
Moved $data to base class and added getData
Fixed indentation
2015-09-14 23:20:20 +01:00
FrancescoUK
eb71dbc300 Fix EAN 13 typos + set pix per bar
Add EAN 8 support
2015-09-14 23:20:19 +01:00
FrancescoUK
68915dd28c Ean13 code generation implementation 2015-09-14 23:20:19 +01:00
FrancescoUK
807d48ac7b Add EAN13 in Barcode lib
Sketched EAN13 class code
Fix typo
2015-09-14 23:20:17 +01:00
FrancescoUK
79fd666bff Add Ean13 file and class
Fixed typos
2015-09-14 23:20:16 +01:00
FrancescoUK
393ac9bb97 Fixed some minor issues 2015-09-14 23:20:15 +01:00
jekkos
c843c174ed Initialize table sorting if this didn't happen when the page was loaded
initially (#139)
2015-09-14 08:26:41 +02:00
Martes Erede
308be8079f [#32] improving the inventory summary report, including total inventory value 2015-09-11 15:58:57 +08:00
jekkos
e9ea2ba792 Create temp table when necessary 2015-09-07 22:53:19 +02:00
jekkos
2c5f3ee759 Add grunt-cache-breaker plugin (#137)
Fix tax inclusive pricing for daily sales overview (#136)
Fix table sorting when using search in daily sales overview (#131)
2015-09-07 22:15:41 +02:00
jekkos
b680cdff36 Fix table sorting after loading search results 2015-09-07 08:35:59 +02:00
jekkos
2b6b3914a7 Mark totals row as static (keep it at bottom of the table issue #131) 2015-09-06 13:19:32 +02:00
jekkos
756b675e2b use configured dateformat for jquery ui date parser
disable sorting on columns 0 and 9 (no data there)
default sorting enabled on column 1
2015-09-05 15:05:20 +02:00
jekkos
1d65ceaccf Merge branch 'master' of https://github.com/daN4cat/opensourcepos 2015-09-05 09:52:48 +02:00
jekkos
0c92cc661f Remove date field type for filters 2015-09-05 09:52:30 +02:00
FrancescoUK
c041a18624 Added Print button to print the current view 2015-09-04 22:51:12 +01:00
jekkos
9281995029 Fix payment summary update on search
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
2015-09-04 23:14:06 +02:00
jekkos
f36c700129 Add date filtering in sales overview
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
2015-09-04 22:09:24 +02:00
FrancescoUK
d35ef071bb - Added cash only filter
- Set to 'all' the sale_type so even returns are shown (we might want to add a drop down filter for this too)
2015-09-04 19:30:43 +01:00
jekkos
a624d21fcd Fix sale detail edit
Make last row in sale table bold (css)
Add default date range between yesterday and today
Temporarily comment out payment type listing in table itself (tbd)
2015-09-04 08:44:20 +02:00
jekkos
9a2cafc1b1 Review payment type overview
Add some padding to bottom of content area
Fix invoice only searching
Make start and end dates optional
2015-09-03 23:35:57 +02:00
FrancescoUK
75fa706299 Sale Overview change
- Refactor and optimise payments part (added now amount to detail sale report too)
- fix some </tr> that should have been </td>
- minor indentation fixes

NOTE: The only_invoices checkbox is not responsive
2015-09-02 23:16:26 +01:00
FrancescoUK
c88f37f8e7 Change Sale Overview to become a daily takings view with totals. 2015-09-01 23:37:26 +01:00
jekkos
3e24b9caff Remove non working datepicker icon
Remove in_array check for duplicated company_name
2015-08-24 21:52:41 +02:00
jekkos
517363b485 Fix deleted checkbox in items form
Clear suggestion cache when toggling deleted filter
2015-08-18 18:10:00 +02:00
jekkos
011caf375f Apply is_deleted in item suggestion search 2015-08-18 08:35:21 +02:00
FrancescoUK
f806ea84b3 Update to Suppliers feature
- added Agency name to identify agent or distributor behind a brand
- updated view to show supplier ID useful for item imports via excel
sheet
- update database table
- updated language although missing translations
- various bit an pieces missing due to failed rebase
2015-08-07 15:02:15 +02:00
FrancescoUK
8bcd2a69dc Add better locale config support (pull request #93)
I've added in this commit the following:

- the means to configure date and time format
- date and time is shown with the selected formats
- a locale tab in the configuration page
- changed location tab to be stock tab and the same for the file names
- translation strings (only English) for the case

NOTE 1: Not related to Locale support but I removed an extra <div
class="field_row clearfix"> from general_config.php

NOTE 2: There is no rules in the submit checks of Locale. Probably this
is something to iron out a bit

NOTE 3: It would be probably nice to add a button in the Locale tab to
regenerate all the translation files in case somebody updates the
translations .csv

Fixed Local config

- Removed text in Red as really not mandatory configuration
- Added time format in 24h and 12h

Updated General Config tab

- reorganised the layout grouping things like company info, taxes and
invoice formating
- increased the limit of max lines per page to 1000 because 50 is too
little. People can do what they want with up to 1000
2015-07-25 12:02:10 +02:00
jekkos
e0f80528f4 Fix report generation regression 2015-07-15 18:14:58 +02:00
jekkos
83a297cf15 Add stock location as filter to detailed sales + receivings reports 2015-07-10 19:04:52 +02:00
jekkos
b1f1feda48 Show alternative description on invoice only if not empty 2015-07-01 08:29:53 +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
ccc2af2a26 Show tax exclusive subtotal in case of tax inclusive pricing 2015-05-23 16:51:42 +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
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
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
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