FrancescoUK
31a223cece
Merge pull request #272 from daN4cat/master
...
#271 fix to error witn xampp due to a spurious "git"
2016-01-04 22:13:29 +00:00
FrancescoUK
3bd778737f
#271 fix to error witn xampp due to a spurious "git"
2016-01-04 22:09:38 +00:00
jekkos
648251978e
Merge pull request #270 from daN4cat/master
...
Fixes to #265 , #267 and #269
2016-01-04 22:13:25 +01:00
FrancescoUK
240c96a185
#267 remove warning due to junk dirs being inside a language/xx one
2016-01-04 19:44:15 +00:00
FrancescoUK
810000e37c
#265 do not override 404 handler in routes.php
2016-01-04 18:23:16 +00:00
FrancescoUK
6aa5126bf0
#269 fix https error issue
2016-01-04 17:55:00 +00:00
jekkos
90591382ce
Further cleanup phppos migration script ( #262 )
2016-01-04 17:26:42 +01:00
jekkos
9e2d89c528
Show discounted price instead of discount itself on receipt
2016-01-04 17:19:50 +01:00
jekkos
1601d679fd
Takings not using proper permission ( #262 )
2016-01-04 17:04:33 +01:00
jekkos
aa0409af48
Add phppos migration script (untested) #258
2016-01-01 17:10:43 +01:00
jekkos
ad194bd4c0
Fix typo in english translation ( #260 )
2016-01-01 16:46:58 +01:00
jekkos
1779685d31
Encode text before storing it as session variable ( #254 )
2015-12-30 08:10:14 +01:00
jekkos
51df82f35e
Update WHATS_NEW
2015-12-30 07:42:27 +01:00
jekkos
bf0622d7fa
Show discounted price per item line
2015-12-26 15:26:32 +01:00
jekkos
da25281df9
Show discounted price per item line
2015-12-26 15:21:54 +01:00
jekkos
2f52d083e8
Update changelog for 2.3.3
2015-12-26 13:13:47 +01:00
jekkos
eb63f49db7
Add barcode generation for EAN8 and EAN13 ( #111 , #246 )
...
Add config option to use generation when generating barcodes for an
Generate propery barcode with configured format if item_number empty
2015-12-26 11:42:58 +01:00
jekkos
c007513fc8
Fix barcode generation error for empty item numbers
2015-12-13 15:57:03 +01:00
jekkos
9f5782e0ba
Add validation for barcode types ( #111 , #246 )
...
Fallback to code128 if invalid EAN8 or EAN13 is detected
2015-12-13 15:51:25 +01:00
jekkos
2f14a0f868
Fix typo in store language line ( #247 )
2015-12-13 14:15:43 +01:00
jekkos
fb924daa81
Show reoder level in items form when editing ( #241 )
2015-12-04 18:13:05 +01:00
jekkos
1bb9acdc37
Fix for adding/deleting stock locations ( #242 )
2015-12-04 18:09:51 +01:00
jekkos
16d5dfce77
Merge pull request #244 from kamaroly/master
...
Fixed Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257
2015-12-03 23:06:22 +01:00
Kamaro Lambert
afa203e73c
Fixed error Only variable references should be returned by reference
...
Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257
2015-11-30 23:30:56 +02:00
jekkos
bc85391734
Submit form when hitting enter in search field for items module ( #187 )
2015-11-09 11:15:42 +01:00
jekkos
7c2cc9646d
Don't override custom invoice numbers ( #223 )
2015-11-09 10:46:35 +01:00
jekkos
c0303cc873
Merge branch 'master' of https://github.com/asakpke/RoshanTech.com-POS
2015-10-20 22:01:37 +02:00
jekkos
0ddd80dc2c
Regenerate thai language ( #205 )
2015-10-20 22:00:18 +02:00
songwutk
af582056d7
update sales_lang.csv : Thai
...
"sales_suspend_sale" too long in button, so change word fit.
2015-10-20 22:00:18 +02:00
jekkos
56859a77ab
Fix path for jquery-ui icons ( #207 )
2015-10-20 13:23:20 +02:00
jekkos
ec5846e1eb
Make receivings datetimepicker consistent with sales form ( #169 )
2015-10-18 21:37:49 +02:00
jekkos
6d5c192447
Add jquery-ui slider for datepicker #169
2015-10-17 00:22:57 +02:00
FrancescoUK
1b90ac14d2
#169 regenerate dist/ js scripts adding datetimepicker jQuery plugin
2015-10-15 19:12:50 +01:00
FrancescoUK
9c775ca44b
#169 Add date and time picker to receivings/form
...
Some code indentation for better readibility.
2015-10-15 18:03:46 +01:00
FrancescoUK
0d87fc51d9
#169 Add a date time picker to sales/form such user can edit transaction date not in a manual manner
...
Needs more testing with different date & time formats and sorting out of min.js
2015-10-14 11:40:59 +01:00
jekkos
c4c7d9d792
Merge pull request #169 from marteserede/master
...
Fix dateformat value in SQL-Query app_config
2015-10-12 09:36:37 +02:00
jekkos
455a5f59d1
Merge pull request #199 from souparno/bug-condition-statement
...
if condition statement missing, may result in server error
2015-10-10 15:09:10 +02:00
souparno
9cf5d5734f
if condition statement missing, may result in server error
2015-10-10 13:11:32 +05:30
jekkos
43b8d32efc
Don't use empty on php expression ( #196 )
...
Signed-off-by: jekkos <jeroen.peelaerts@gmail.com >
2015-10-09 17:11:24 +02:00
jekkos
0c25b01666
Add default line endings
2015-10-09 11:43:19 +02:00
jekkos
1fd7fda645
Fix totals calculation when adding item multiple times (issue #165 )
...
Fix typo in script comments
2015-10-09 10:24:38 +02:00
jekkos
3eb798917d
Clear out empty sales and receivings comments on database upgrade
...
(#192 )
2015-10-08 18:43:52 +02:00
jekkos
64023f6eec
Avoid comments coercion to 0 when suspending sales ( #192 )
...
Invoice number in suspended sales should not be unique
2015-10-08 18:29:55 +02:00
jekkos
d8a369f39d
Remove unique constriant from invoice_number column in suspended_sales
2015-10-08 18:29:55 +02:00
jekkos
98b0df9e80
Merge pull request #194 from daN4cat/master
...
#192 Remove 0 from comments
2015-10-07 13:11:18 +02:00
FrancescoUK
763a9e73fa
#192 Remove 0 from comments
...
Checked in library get_comment if the string is null and return a '' if that's the case. That removes the 0 from sale comments
2015-10-07 09:37:27 +01:00
jekkos
df5a0448aa
Merge pull request #193 from daN4cat/master
...
#192 Fix to comment not saved when suspending a Sale
2015-10-07 10:07:31 +02:00
Aamir Shahzad
76365afbd2
Added my name, ID and website in COPING
2015-10-06 22:58:37 +05:00
Aamir Shahzad
6e27b4c9ec
Extra comments removed
2015-10-06 22:52:00 +05:00
FrancescoUK
a7e2ea5fa7
#192 Fix to comment not saved when suspending a Sale
...
The issue was that for a strange reason the comment was fetched directly from the form instead of using the sale_lib->get_comment like in the rest of the code.
2015-10-06 17:55:58 +01:00
