Commit Graph

94 Commits

Author SHA1 Message Date
jekkos
fcc71a5f74 Sale reporting now takes tax inclusive pricing into account 2015-05-19 22:44:03 +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
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
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
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
95ae2766cd Giftcard get_all parameters were in opposite order
Invoice layout improvements
2015-04-06 15:15:40 +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-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
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
9351a263ee Review sales overview pagination (use generic intialisation in
secure_area.php)
2015-02-25 13:30:03 +01:00
jekkos-t520
cb1075e6c0 Remove sale_type parameter from get_detailed_sales and
get_detailed_receivings methods
2015-02-24 10:22:19 +01:00
jekkos-t520
e688a24326 Fix sale suspend (redundant payment_type field was removed)
Gender is now properly saved in suppliers module
2015-02-24 08:10:53 +01:00
jekkos-t520
e96dd7883e remove count_all
fix pagination row counts for modules
2015-02-21 23:58:31 +01:00
jekkos-t520
17594f95f1 Add lines per page option
Add default sales discount option
Fix supplier pagination
2015-02-21 21:57:41 +01:00
jekkos-t520
9e427485f3 Fix items module filtering
Fix double to_currency wrapper for amount_change in receipt
Fix tablesorter js error with empty tables
Upgrade tablesorter.js to latest version
Adapt some labels for dutch
2015-02-21 18:05:12 +01:00
jekkos-t520
c389e6030c Fix pagination for all modules (links updated for index+search through
AJAX)
2015-02-20 17:36:03 +01:00
jekkos-t520
0f77300131 Sales overview added to register screen
Add pagination to default search routine
Remove payment_type column from sales table (was redundant)
Fix search spinner location (just toggle ac_loading class)
Complete sale labels
2015-02-20 15:54:13 +01:00
jekkos-t520
babddd524c Refactor variable substitution for receiving invoice numbers
Use localStorage to store selected printer
Add printer selection for invoice template
Print after sale checkbox is now present in receivings and sales screen
Remove print after sale options from receipt_config
Add default translations to receivings_lang.csv
Fix some bugs preventing to print and email at the same time
2015-02-19 18:10:31 +01:00
jekkos-t520
50006aeb6a Email pdf generation
Added invoice template
Add latest dompdf release
2015-02-18 18:18:09 +01:00
jekkos-t520
c7c4ac15d6 Set update_row response datatype to html
Remove MY_Validation override (not needed anymore)
Add jquery validation check for account_number
2015-02-17 09:03:47 +01:00
jekkos-t520
b5c33b4fcb Add $YCO parameter (invoice numbering per year) 2015-02-12 15:19:57 +01:00
jekkos-t520
ade913f0e4 Merge github pull request #30 2015-02-11 16:31:31 +01:00
jekkos-t520
f021215cbb Show proper error message on upload misconfiguration
Use jquery-validation to do item_number check
Fix invoice_number validation in sale edit form
2015-02-11 11:32:58 +01:00
jekkos-t520
3594c348ee Fix stock location permissions for github issue #34 2015-02-10 16:04:52 +01:00
jekkos-t520
c40ad31ed0 Review item import (check item_number and throw proper error) 2015-02-10 15:43:10 +01:00
jekkos-t520
ec6455647f Merge branch 'feature/item_pics'
Conflicts:
	database/2.3_to_2.3.1.sql
	database/database.sql
	translations/items_lang.csv
2015-02-05 17:05:51 +01:00
jekkos-t520
7efb1428f5 Basic image upload working now 2015-02-04 13:27:09 +01:00
jekkos-t520
7c24682584 Fix stock location removal 2015-02-02 16:55:26 +01:00
jekkos-t520
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +01:00
Martes Erede
4ddec66d7b #27 Using bc-style operations now. 2015-01-29 16:22:44 +01:00
jekkos-t520
08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00
jekkos-t520
f323bec9ca Merge branch 'refactor/edit_stock_locations'
Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
2015-01-27 19:24:59 +01:00
jekkos-t520
24a6c9c34f Config location editing works now 2015-01-27 19:03:57 +01:00
jekkos-t520
8705b91bd3 Start refactoring the stock locations configuration screen 2015-01-26 08:11:21 +01:00
jekkos-t520
b9ee7b6b01 Invert quantity correction when deleting sales 2015-01-25 16:07:53 +01:00
Martes Erede
927dbbabb6 Feature #27: Changing cost price while receiving items 2015-01-24 21:40:07 +01:00
Malte Srocke
7544aae394 Bug #25: Deleting a sale/receiving would not effect the stock/quantity. 2015-01-24 19:44:19 +01:00
Malte Srocke
606eb01a67 - fixed excel import: if there was missing a location-id in the import-csv, then there would not have been created an entry into item_quantities for the item and location.
- fixed also the inventory info-part: before in the inventory-table there was no quantity inserted and data[10] as the location_id
2015-01-22 22:19:23 +01:00
jekkos-t520
dd369118c5 Add check payment type to temp sales table again 2015-01-16 18:43:38 +01:00
jekkos-t520
0f34a6ace4 Ignore receiving_quantity = 0 for receivings 2014-12-26 11:39:26 +01:00
jekkos-t520
c00c604c21 Fix tax inclusive pricing for non taxable customer
Show receiving quantity in receiving receipt
Allow to use invoice number as zero (a bug prevented 0 to be saved to
db, causing it to stop incrementing next time)
2014-12-18 19:55:20 +01:00
jekkos-t520
efff9d20c1 Add giftcard number autogeneration 2014-12-16 18:36:26 +01:00
jekkos-t520
07a32a0deb Remove invoice / sale format enable option
Add giftcards -> person_id foreign key constraint
Fix tax calculation for non taxable customers
Improve giftcard person autocompletion
2014-12-16 08:49:49 +01:00
jekkos-t520
1c1b89db21 Fix detailed sales report for sale_type = sale 2014-12-04 08:49:36 +01:00
jekkos-t520
d7a61080e2 Add duplicate invoice number error message in sales module
Fix colspan width for receivings (one column was added for
receiving_quantity)
2014-11-26 21:56:18 +01:00
jekkos-t520
094a293c78 Fix invoice number insert in receivings 2014-11-06 07:35:54 +01:00
jekkos-t520
3007173833 Add invoice numbering to sales module 2014-10-31 07:58:46 +01:00
jekkos-t520
96c349b099 Add invoice numbering to sales module 2014-10-30 19:22:49 +01:00