mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-01 05:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
692 Commits 35 Branches 40 Tags
2.3.3
Commit Graph

108 Commits

Author SHA1 Message Date
jekkos
c408afad67 Cleanup migration script, mostly working now (#262) 2016-01-05 17:41:43 +01:00
jekkos
b1ba7d0afe Split up database.sql in scripts for tables and contraints. 
Use both new scripts in phppos_migrate.sql
 2016-01-05 07:41:49 +01:00
jekkos
90591382ce Further cleanup phppos migration script (#262) 2016-01-04 17:26:42 +01:00
jekkos
aa0409af48 Add phppos migration script (untested) #258 2016-01-01 17:10:43 +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
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
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
d8a369f39d Remove unique constriant from invoice_number column in suspended_sales 2015-10-08 18:29:55 +02:00
jekkos
56f7be21ae Merge pull request #171 from souparno/bug-fix-reset-database 
reset database syntax contains check, so as it can be used to create…
 2015-09-23 22:57:46 +02:00
souparno
47c8d6c0bd reset database syntax contains check, so as it ccan be used to create the database for the first time 2015-09-23 21:29:17 +05:30
Martes Erede
2bc7b688ff Fix dateformat value in SQL-Query app_config 2015-09-22 07:17:57 +02:00
FrancescoUK
569bf4db69 #111 Change databse.sql barcode defaults 2015-09-19 17:52:14 +01:00
jekkos
80f7966d1c Add default dateformat and timeformat in data scripts 2015-09-06 15:53:11 +02:00
jekkos
eb3657e76f Fix upgrade script (2) 2015-08-13 22:53:52 +02:00
jekkos
61206547cb FIll in empty location_ids for existing data 2015-08-12 15:10:08 +02:00
FrancescoUK
cc06d93d30 Remove LICENSE file (use COPYING now instead) 
Update agency_name constraint in update script
Show supplier_id in suppliers for use with item excel import
 2015-08-09 12:01:09 +02:00
jekkos
7926a05948 Regenerate language files 
Remove committed merge conflict in giftcard_numbering.js
Add sql upgrade script for 2.3.3
 2015-08-07 17:17:53 +02:00
FrancescoUK
f806ea84b3 Update to Suppliers feature 
- added Agency name to identify agent or distributor behind a brand
- updated view to show supplier ID useful for item imports via excel
sheet
- update database table
- updated language although missing translations
- various bit an pieces missing due to failed rebase
 2015-08-07 15:02:15 +02:00
jekkos
80dcc2f63f Increase waiting timeout for phantomjs test 
Revert old database script
Add styling rules for number typed input fields
 2015-07-14 12:36:43 +02:00
jekkos
92da2749ad Adapt report summary to chosen stock location 
Update release notes
 2015-07-13 18:39:50 +02: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
1ad08c014f Fix giftcard numbering issue #65 2015-05-21 22:00:33 +02:00
jekkos
b2a37b7ded Add category column again 2015-05-01 12:11:49 +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
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
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
b85b9d37a1 Add company_name field to customers for invoicing purposes 
Total discount is now shown as one amount in receipt

Conflicts:

	application/controllers/sales.php

Conflicts:

	database/migrate_phppos.sql
 2015-04-06 15:15:34 +02:00
jekkos
a8f353de9c Add constraint for trans_location foreign key 
Use Code128 for receipt barcodes in sales and receivings
 2015-03-31 15:05:30 +02:00
jekkos
ca2c9a6ae4 Item refresh fix for issue #42 
Invoice number in email message are denoted with $INV
Sale id's in email message are denoted with POS $sale_id
 2015-03-17 17:41:12 +01:00
jekkos-t520
0e357f14f6 Add option to show total discounts on receipt 2015-03-05 08:28:58 +01:00
jekkos-t520
8981efbd2a Fix error in database script 
Add script to reset database easily (with root user)
Remove old git-svn script
 2015-02-26 22:08:14 +01:00
jekkos-t520
98cae8928b Cleanup table encoding + auto_increment 
Conflicts:

	database/database.sql
 2015-02-26 14:38:13 +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
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
7081fe0338 Remove non free barcodegen library 
Add width and height parameters for code39 barcode generation
 2015-02-05 17:00:41 +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
jekkos-t520
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +01:00
jekkos-t520
08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00