Commit Graph

132 Commits

Author SHA1 Message Date
FrancescoUK
39dbd9af52 Small code refactoring 2017-09-17 15:17:48 +01:00
jekkos
a92d60d99f Minor refactoring tax story 2017-07-14 00:07:13 +02:00
FrancescoUK
181d904360 Visualise the taxes according to the selected number of decimals (#1133) 2017-07-06 20:31:35 +01:00
FrancescoUK
c8499599ab General code tidy up, added documentation 2017-07-02 11:15:57 +01:00
FrancescoUK
4c2d63bbd3 Added Total Spent to Customer tabular view 2017-04-29 19:55:03 +01:00
FrancescoUK
5bdf6d396b Add Mailchimp connector (#113) avoid email duplicates (#112) 2017-04-22 16:07:33 +01:00
Steve Ireland
effba9d102 Add support for customer sales tax and cash rounding 2017-04-14 21:21:44 -04:00
FrancescoUK
be66258bfc Fix bugs (#1026) 2017-01-31 23:03:53 +00:00
FrancescoUK
87247333cc Fix bugs (#1026) 2017-01-31 22:52:37 +00:00
i92guboj
b373b1e07e Merge branch 'master' into pic_filename 2017-01-30 17:45:47 +01:00
jekkos
4b1d5456cc Improve PHP7 compatibility (#591) 2017-01-21 00:01:59 +01:00
i92guboj
06db967ee6 simplify code cause pic_thumb() always receives filename.ext 2016-12-20 20:46:00 +01:00
i92guboj
d9a4f93cfa pic_filename behavior and silent migration from pic_id 2016-12-19 20:18:05 +01:00
jekkos
422e2ddbab Add currency sorting for summary reports (#1003) 2016-11-26 14:49:41 +01:00
FrancescoUK
c5988adbbb Fix read_only flag issue (#1003) 2016-11-26 12:03:22 +00:00
jekkos
2727e91c96 Fix currency sorting in tabular_details (#1003) 2016-11-26 12:17:13 +01:00
jekkos
4304f5ceea Revert tabular_details changes (#1003) 2016-11-26 00:12:33 +01:00
jekkos
1666a3e689 Fix detailed sale + receiving report row update + currency sorting (#1003) 2016-11-25 22:24:46 +01:00
FrancescoUK
5047ca0f41 Fix Sales Takings multiple taxes issue and swap table columns (#976) 2016-11-19 15:15:43 +00:00
FrancescoUK
19165133ae Revert receipt being open in a new window (#966) 2016-11-10 17:43:24 +00:00
FrancescoUK
ed80627ddd Takings, sale edit, receipt database performance improvement - no temp table - (#964) 2016-11-09 18:06:23 +00:00
FrancescoUK
b1c36b790f Fix to item pic ID 0 issue (#921)
Some code clean up too.
2016-10-19 18:47:57 +01:00
FrancescoUK
38d234fa5f Fixed receipt, change due and total cash issues with no payment cases (#707) 2016-07-09 10:04:04 +01:00
FrancescoUK
5be0feafe9 Inverted Sale edit form Delete and Submit buttons 2016-07-05 20:24:52 +01:00
FrancescoUK
4618af352c Fixed New button in items form: visible in New Item not Edit/Update Item 2016-07-05 20:20:33 +01:00
jekkos
7b674b2e3f Fix submit in items, customers and sales (#716)
Add again new button functionality in items (#712)
Bugfixes for csrf tokens (#599)
2016-07-04 23:20:14 +02:00
jekkos
90660fd9e9 Fix close button in stock details (#14) 2016-07-04 18:03:25 +02:00
jekkos
bb1a1ccd62 Fix table_helper after bad merge 2016-07-04 17:45:08 +02:00
jekkos
806c1b9986 Add csrf token in forms (#599, #597) 2016-07-04 17:38:58 +02:00
FrancescoUK
0ba5cadbb7 More models/Sale refactoring, fix button order in sales/form, make inventory count button a close one 2016-07-03 20:23:06 +01:00
FrancescoUK
6466a71c0a Removed all the character_limiter affecting tabular views (#692) 2016-06-26 12:20:35 +01:00
FrancescoUK
4b64269905 Fixed regression introduced with button translation support change (#699) 2016-06-25 16:06:59 +01:00
jekkos
57759d2775 Make bootstrap dialog buttons translatable (#439)
Update deploy instructions in Readme (#616)
Add partial views to load CI translations in javascript (#439)
2016-06-25 01:54:54 +02: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
FrancescoUK
336e10d445 Controller class hierarchy refactoring, made xss_clean part of base Secure_Controller class (#39) 2016-06-08 18:13:34 +01:00
FrancescoUK
5d66b9fbfd Do not show 'Send SMS' glyphicon, if phone number is not available (#602) 2016-05-28 23:05:03 +01:00
jekkos
35b12df144 Remove empty column from columns dropdown in detailed sales/receivings reports (#571) 2016-05-20 17:35:07 +02:00
jekkos
fc2d5e89f0 Remove empty column switches in dropdown (switchable on column header) (#563) 2016-05-17 08:59:51 +02:00
jekkos
c83a46c726 Add change due to sale totals row + remove checkbox after load (#559) 2016-05-16 11:23:06 +02:00
jekkos
7e8f0e1dc1 Enable sorting for employees, giftcards and suppliers (#555) 2016-05-12 21:29:27 +02:00
jekkos
2a858b3f23 Collapse rows in detailed report after delete (#507, #293)
Hide columns without title in takings print view (#507)
Execute grunt after running bower uninstall
Try to fix integration tests
2016-05-12 18:02:26 +02:00
jekkos
5312dba499 Do not show checkbox and empty columns on takings print (#293, #507) 2016-05-12 08:47:35 +02:00
jekkos
d78c871855 Show empty column if no tax_percent found for item (#507) 2016-05-09 20:15:00 +02:00
jekkos
c3f2f41888 Fix barcode generation in items and item_kits (#537, #538)
Enable sorting in takings (with static row below the table) (#293, #507)
2016-05-09 18:40:13 +02:00
jekkos
d94b1d921e Enable sorting for items, customers, suppliers, employees and item_kits module (#293, #507) 2016-05-09 08:59:03 +02:00
FrancescoUK
16e6042c9c Fixed missing currency symbol in Item Kits view (#507) 2016-05-06 18:58:10 +01:00
jekkos
eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +02:00
jekkos
e2f6bf283c Show invoice icon if invoices enabled in config (#507)
Fix limit query for customers table (#507)
Add reference to translation when no persons found (#507)
2016-05-03 18:09:58 +02:00
jekkos
c2f895c1d4 Rebase with latest master (#293, #472)
Enable email button in customers, suppliers only if selected row has
email filled in
Disable sale/receiving edit in reports (TBC)
2016-05-03 08:58:11 +02:00
jekkos
2adc096eeb Add invoice number and payment type in takings overview (#507) 2016-05-03 08:10:38 +02:00