Commit Graph

1482 Commits

Author SHA1 Message Date
FrancescoUK
6c791afffc Fixed Item Kits comment typos and small refactoring (#665) 2016-06-19 21:07:10 +01:00
jekkos
6c6e41495c Fix item kit barcode generation (#665) 2016-06-19 19:15:09 +02:00
FrancescoUK
a4488ec090 Further regression fix with item edit and deleted flag (#672) 2016-06-19 12:58:47 +01:00
FrancescoUK
c75675129b Fixed typo in Barcode 39 exception message 2016-06-19 12:47:20 +01:00
FrancescoUK
ac968e21e6 Additional tidy up (#667) 2016-06-19 12:35:52 +01:00
FrancescoUK
ad1b3aeaac Allowed search box and filters to be contextual to selected date range (#667) 2016-06-19 11:57:53 +01:00
FrancescoUK
8c5decee34 Fix regression introduced with #664 around deleted items (#672) 2016-06-19 11:11:16 +01:00
FrancescoUK
bbbf24c2a5 Don't allow adding deleted Items by item_id in Sales register and Receiving (#664) 2016-06-18 12:52:58 +01:00
FrancescoUK
936c74211f Small refactoring of Sales form (#639) 2016-06-18 11:46:45 +01:00
jekkos
fdb5e3406e Fix syntax erorr in is_valid_receipt (#655) 2016-06-17 18:09:03 +02:00
jekkos
359184934e Fix refresh after deleting all items on last page (#627) 2016-06-16 23:11:40 +02:00
jekkos
776c819509 Tag docker image and push to docker hub (#616) 2016-06-16 23:11:40 +02:00
FrancescoUK
1c4f6f4fb3 Update daterangepicker in bower no dist regen 2016-06-16 19:13:35 +01:00
FrancescoUK
28d3a3dce3 Fixed error with barcode auto generate (#640) 2016-06-16 19:13:35 +01:00
jekkos
fb4dc5af84 Remove curl call to wait for container (#616) 2016-06-16 20:04:29 +02:00
FrancescoUK
26358620eb Fixed bug with barcode auto generation (#640) 2016-06-16 17:54:12 +01:00
jekkos
105eca20b2 Update portugese (brazilian) translations (#650) 2016-06-16 17:49:45 +02:00
jekkos
9e675e81ec Perform regex check in is_valid_receipt (#655) 2016-06-16 17:40:26 +02:00
jekkos
86b22e7987 Make travis build regular dockerFile directly (#616) 2016-06-15 20:42:29 +02:00
jekkos
c39e0a2ed4 Copy curl into test container (#616) 2016-06-15 18:42:49 +02:00
jekkos
1cadd2b06b Run docker-compose up in background (#616) 2016-06-15 17:57:04 +02:00
jekkos
6b5d61414c Enable item kit return (#655)
Don't install curl in test container (#616)
2016-06-15 17:34:39 +02:00
jekkos
3890eaf162 Show general config error messages in the correct place (#655) 2016-06-15 17:18:32 +02:00
jekkos
4b0badfb30 Fix customer search in takings (#654)
Replace payment type label with amount tendered (#513)
2016-06-15 17:18:31 +02:00
jekkos
1861f4f71f Don't take totals row in takings into account for pagination (#620)
Reset payment summary css position underneath table
2016-06-15 17:18:31 +02:00
jekkos
3129319efe Try to start test container as travis-ci test (#616) 2016-06-15 14:24:01 +02:00
jekkos
1392055d44 Adapt default test container command (#616) 2016-06-15 14:22:24 +02:00
jekkos
4119d8d5a8 Build image using docker-compose (#616) 2016-06-14 12:50:34 +02:00
jekkos
5d494fa08e Fix bstables pagination when deleting all items in last page (#627) 2016-06-14 08:35:14 +02:00
FrancescoUK
3a5b88d51c Added configuration order of payment options available in Sales Register (#456 #646) 2016-06-13 19:39:02 +01:00
FrancescoUK
11ad1c2476 Regen dist files 2016-06-13 18:58:17 +01:00
FrancescoUK
17443a3d4f Fixed ugly invoice issue (#442) and added company name in invoices always 2016-06-13 18:33:40 +01:00
FrancescoUK
9dc7405eaa How to remove index.php from URL (#645) + set a config rule to be strict with sessions matching IP 2016-06-13 17:54:31 +01:00
FrancescoUK
cd6277c1a8 Removed use_invoice_template as it's not used anymore (#639) 2016-06-13 09:15:43 +01:00
FrancescoUK
73dc5a9f70 Merge branch 'sonnysk76-master' 2016-06-12 18:55:31 +01:00
FrancescoUK
4da7285f38 Update Spanish Translations #569 2016-06-12 18:54:42 +01:00
FrancescoUK
b96ebeed22 XSS clean Sales (#39), refactored Sales Controller (#639), added Send Email in Receipt & Invoice (#475) 2016-06-12 18:15:43 +01:00
jekkos
edfd0319a8 Update docker on travis using sudo (#616) 2016-06-11 20:39:58 +02:00
jekkos
facc25eb74 Set travis docker version to 1.10.3 (#616)
Fix typo in README.md
2016-06-11 20:29:24 +02:00
jekkos
b7f54c0366 Fix .travis.yml file structure 2016-06-11 18:51:58 +02:00
sonnysk76
9f7ea6f1cb merging 2016-06-10 16:58:26 -05:00
jekkos
aae02dc060 Disable invoice creation after sale / receiving completion (#619) 2016-06-09 22:29:41 +02:00
jekkos
e6c173dcdc Merge branch 'master' of https://github.com/jekkos/opensourcepos 2016-06-09 20:40:30 +02:00
jekkos
0923ed0f80 Enable receiving invoice number override (#626) 2016-06-09 20:39:38 +02:00
FrancescoUK
1ad844fe74 Fixed Customer Account # issue (#633) 2016-06-09 19:31:41 +01:00
jekkos
9fb4d5ccd4 Fix email button enabled state (#628) 2016-06-09 17:55:35 +02:00
jekkos
463938bc88 Upgrade travis docker-compose to 1.7.1 (#616) 2016-06-09 17:21:20 +02:00
jekkos
9d25520dbf Add docker service to travis.yml (#616) 2016-06-09 16:52:57 +02:00
jekkos
03bfa43378 Push docker build to travis-ci if container start is ok (#616) 2016-06-09 10:51:06 +02:00
FrancescoUK
b72d1059c0 Do not restrict Message Store Config access by user grants (#472) 2016-06-09 08:53:07 +01:00