Commit Graph

21 Commits

Author SHA1 Message Date
FrancescoUK
2bc702acc8 Fix old database upgrade scripts (#1546) 2017-09-04 19:37:38 +01:00
FrancescoUK
c88bbe3852 Merge pull request #1515 from objecttothis/patch-8
Ignore pre-existing rows
2017-08-24 19:22:29 +01:00
objecttothis
3af4bf0187 Ignore pre-existing rows
sales_stock and receivings_stock already exist at the point this insert gets run causing the sql to fail.  Adding the IGNORE directive causes duplicate entries to be skipped in the insert.
2017-08-24 17:55:35 +04:00
objecttothis
1d4692a44a This insert actually needed to be done in 2.3_to_2.3.1
I've already submitted the change in 2.3_to_2.3.1.sql
2017-08-24 17:44:19 +04:00
jekkos
46b5c18aca Add receiving_quantity field to ospos_receivings (issue #78)
Detailed receiving now correctly shows purchased quantity
2015-06-20 14:59:37 +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
8f09a32ef5 Correct latest alter table statements for 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
80dbe6efa7 Company name can be DEFAULT NULL in database 2015-04-09 07:18:50 +02:00
jekkos
7a4df2a050 Fixup db script 2015-04-07 19:13:45 +02:00
jekkos
e9b4e57c06 Add company_name column to ospos_customers 2015-04-06 15:47:38 +02:00
jekkos-t520
0e357f14f6 Add option to show total discounts on receipt 2015-03-05 08:28:58 +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
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
a809807288 jsPrintSetup plugin integration
All receipt print configuration options present now
2015-02-17 16:46:57 +01:00
jekkos-t520
a8e15f7db0 Add company logo upload feature in config (will show on receipts) 2015-02-12 15:47:31 +01:00
jekkos-t520
4e6a6d6434 Add gender to people + employees form 2015-02-11 14:29:46 +01:00
jekkos-t520
7efb1428f5 Basic image upload working now 2015-02-04 13:27:09 +01:00
jekkos-t520
46cfe0b18a Add databse upgrade script for 2.3.2 2015-02-03 17:33:43 +01:00