mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-03 05:12:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,123 Commits 91 Branches 39 Tags
28d89c685bc5aedabb71b993fa329b506960f044
Commit Graph

52 Commits

Author SHA1 Message Date
FrancescoUK
7682f02222 Removed language="javascript" as deprecated 2016-06-27 21:04:27 +01:00
FrancescoUK
586c8f8db9 Added support for receipt templates, added default and short version (#678) 2016-06-26 20:06:37 +01:00
FrancescoUK
d911447b43 Fixed wrong recvs_invoice_number usage in sales receipt (#694) 2016-06-23 23:08:43 +01:00
FrancescoUK
e9fe27a59e Further fix of email receipt regression (#475) 2016-06-21 09:07:12 +01:00
FrancescoUK
e56f418696 Fixed email receipt regressions (#475) 2016-06-21 08:56:29 +01:00
jekkos
4cf1c31d4f Remove padding for comments field in register (#680) 
Properly align checkboxes in right lower corner (#680)
Add fix for bootstrap-tables delete and regen dist (#627)
Tidy up receipt email send code (use empty instead of isset)
 2016-06-21 08:40:56 +02:00
jekkos
8aa46126c5 Use bootstrap grid for payment options in sale register (#116) 
Short review of receipt/invoice email send (#475)
 2016-06-20 21:30:58 +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
ce2142add4 Made description and serialnumber optional in receipts (#499) 2016-04-22 21:42:17 +01:00
FrancescoUK
d1de7b67b9 Remove stock location from sale receipts (#498) 2016-04-22 19:37:00 +01:00
FrancescoUK
d9b007c1af Improve emailed receipt layout and make it look like the printed one (now added logo + company name) (#442) 2016-04-10 18:15:59 +01:00
FrancescoUK
afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK
6efdccfef0 add configurable quantity decimals (#429) 2016-04-01 00:07:05 +01:00
FrancescoUK
5e97358e90 enable jsPrint in receipt, invoice and Takings (sales/manage) (#394) 2016-03-14 19:54:46 +00:00
FrancescoUK
87853f0da4 add navigation buttons in sales receipt and invoice, fix invoice styling (#394) 2016-03-14 17:21:28 +00:00
FrancescoUK
0bd5bbec77 remove encode/decode base64 causing issues with web hosting providers (#374) 2016-03-13 10:52:32 +00:00
jekkos
9e2d89c528 Show discounted price instead of discount itself on receipt 2016-01-04 17:19:50 +01:00
jekkos
1779685d31 Encode text before storing it as session variable (#254) 2015-12-30 08:10:14 +01:00
jekkos
da25281df9 Show discounted price per item line 2015-12-26 15:21:54 +01:00
jekkos
ccc2af2a26 Show tax exclusive subtotal in case of tax inclusive pricing 2015-05-23 16:51:42 +02:00
jekkos
de3d7ce726 Add new language line for check_remainder 2015-04-07 19:10:46 +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
43ecda44e0 Receipt totals layout improvement (show top border when no discount or 
tax section present)
Remove unexistant script include from invoice_email template
 2015-04-06 15:38:52 +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
8ff742085a Multiple total disconuts are shown correctly now 2015-03-31 21:56:44 +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
b29ec8ef31 Fix show discounts functionality 
Review tax price calculations
Remove tax exclusive price in invoice.php template
 2015-03-07 19:35:13 +01:00
jekkos-t520
4ac1a943eb Update totals calculation 
Update tax inclusive calculation
 2015-03-06 00:58:44 +01:00
jekkos-t520
0e357f14f6 Add option to show total discounts on receipt 2015-03-05 08:28:58 +01:00
jekkos-t520
3204391521 Always show name instead of description (twice) 2015-02-25 13:30:17 +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
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
6ff19cb3f3 Merge branch 'feature/invoice_template' 2015-02-19 16:11:57 +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
8edff136d0 Show company name on receipt when no logo is set 2015-02-18 08:53:18 +01:00
jekkos-t520
4025883765 show taxes was reversed 2015-02-18 00:16:18 +01:00
jekkos-t520
b9b8e2b4e5 remove php shorthand tags (incompatibility across installs) 2015-02-17 23:06:24 +01:00
jekkos-t520
13f6640576 Add show taxes checkbox value (state was not persisted) 
Disable printing options when unchecking print after sale
 2015-02-17 22:58:10 +01:00
jekkos-t520
aa969273db Disable config fields that require addon when this one is not enabled 
Obey to user confirm outcome to save config or not
Fallback to window.print when addon is not installed (as it was
previously)
 2015-02-17 17:08:46 +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
7ec4c21587 Merge branch 'master' into feature/receipt_config 2015-02-17 12:20:33 +01:00
jekkos-t520
cf2ca1e6c7 Start receipt rework 2015-02-17 09:01:56 +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
fe081779c5 Fix number_format bug when entering an empty payment amount 
Add giftcard balance to final receipt (if giftcard payment present)
 2015-02-12 14:34:08 +01:00
jekkos-t520
4332bce401 Replace old code39 generator for receipts with new barcode_lib 
functionality
 2015-02-09 18:08:46 +01:00
jekkos-t520
96c349b099 Add invoice numbering to sales module 2014-10-30 19:22:49 +01:00
jekkos-t520
e1e5434e2a Stock locations are now shown on receivings and sales receipts 
Database migration script now defines a default stock location name
Rmeove obsolete constraints from migration script
 2014-08-11 13:10:29 +02:00
pappastech
ed2de61aeb Upgrade to 2.0_RC2 to fix barcodes on receipts. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@40 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-26 01:40:46 +00:00
pappastech
ecdf3a5aa1 Version 2.0_RC1. Upgrade to CI 2.1.0. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@24 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:16:01 +00:00