Commit Graph

69 Commits

Author SHA1 Message Date
Jeroen Peelaerts
6705e5f259 Add item_number to item kits module 2021-02-10 10:27:17 +01:00
Jeroen Peelaerts
4e83d967c1 Fix receiving return total (#3033) 2020-11-25 20:19:48 +01:00
jekkos
8d6a23d0e7 Check if grant for module exists (#2702) 2020-01-30 08:56:39 +01:00
jekkos
d3d051ee72 Fix loading attribute values in item search (#2232) 2019-06-05 00:31:45 +02:00
jekkos
02d7588e59 Add config item for default order discount 2019-01-13 13:18:51 +01:00
jekkos
288b4029d7 Add attributes to detailed sales/receiving reports (#68) 2018-10-15 19:32:29 +02:00
jekkos
df61ee09bb Add item attributes functionality (#68) 2018-10-15 19:32:29 +02:00
Erastus
858f7614f9 merge branch 2018-09-03 01:10:28 -05:00
Erastus
3b659526f3 cleaning spaces 2018-09-02 17:58:41 -05:00
jekkos
da114ae988 Add item_number to receivings view 2018-09-01 09:42:46 +02:00
Erastus
a6b11e6f48 new discount on sales 2018-08-31 15:27:44 -05:00
Erastus
85bbbe835c Discount on Sales 2018-08-20 13:41:56 -05:00
jekkos
a4e135eb92 Add support for multi-pack items. 2018-07-05 19:05:54 -04:00
FrancescoUK
7789675a55 Merge branch 'RuleDomain-fix-item-kit-cost' (#1580 #1595)
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-09-16 20:46:12 +01:00
FrancescoUK
863988d2ab Regen ApiGen documentation 2017-07-06 22:13:18 +01:00
FrancescoUK
c8499599ab General code tidy up, added documentation 2017-07-02 11:15:57 +01:00
odiea
e2e0ade259 Update for Items receiving_quantity 2017-06-24 13:03:00 +01:00
Steve Ireland
7f8ac815ef Fix the line total extension error when receiving the same item multiple times. 2017-04-16 10:06:24 -04:00
FrancescoUK
d380524f9d Sales and Receivings code refactoring 2016-11-09 10:06:09 +00:00
FrancescoUK
2d8bd2d307 Show deleted items in Receiving receipt (#904) 2016-10-17 08:32:03 +01:00
jekkos
d8e4bf48d8 Check if payments cover sale with exact precision (#733)
Set bc-operation style scale globally
Add location filtering in graphical and summary reports (#742)
2016-07-20 20:43:31 +02:00
FrancescoUK
cf860be1fc Small refactoring of library classes 2016-06-23 18:12:18 +01:00
FrancescoUK
2ca3911d56 No autoload and refactoring of SMS lib and Message Controller to be consistent with the rest of libraries (#693) 2016-06-23 09:05:30 +01:00
FrancescoUK
9a1def21cc Code tidy up (#635) 2016-06-21 18:34:24 +01:00
FrancescoUK
bb85a172a2 Change invoice_number in Receiving to be Reference, tidy up code (#635) 2016-06-21 08:50:11 +01:00
FrancescoUK
15fd832705 XSS clean Receiving (#39) code refactoring and various issues fixing 2016-06-20 22:22:46 +01:00
jekkos
fdb5e3406e Fix syntax erorr in is_valid_receipt (#655) 2016-06-17 18:09:03 +02:00
jekkos
9e675e81ec Perform regex check in is_valid_receipt (#655) 2016-06-16 17:40:26 +02:00
jekkos
6b5d61414c Enable item kit return (#655)
Don't install curl in test container (#616)
2016-06-15 17:34:39 +02:00
jekkos
aae02dc060 Disable invoice creation after sale / receiving completion (#619) 2016-06-09 22:29:41 +02:00
FrancescoUK
f6be7cdf23 Merge branch 'master' into bootstrapUI 2016-03-13 16:19:44 +00:00
FrancescoUK
0bd5bbec77 remove encode/decode base64 causing issues with web hosting providers (#374) 2016-03-13 10:52:32 +00:00
FrancescoUK
2df8645c5f code comments, various bits and bobs (#116) 2016-03-11 17:20:07 +00:00
jekkos
1779685d31 Encode text before storing it as session variable (#254) 2015-12-30 08:10:14 +01:00
jekkos
7c2cc9646d Don't override custom invoice numbers (#223) 2015-11-09 10:46:35 +01:00
jekkos
43b8d32efc Don't use empty on php expression (#196)
Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
2015-10-09 17:11:24 +02:00
jekkos
64023f6eec Avoid comments coercion to 0 when suspending sales (#192)
Invoice number in suspended sales should not be unique
2015-10-08 18:29:55 +02:00
FrancescoUK
763a9e73fa #192 Remove 0 from comments
Checked in library get_comment if the string is null and return a '' if that's the case. That removes the 0 from sale comments
2015-10-07 09:37:27 +01:00
jekkos
e1ddcbbb5b Rename Item_quantities model to Item_quantity
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
2015-09-17 21:59:33 +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-t520
dbddb34ed4 Receipt total is recalculatd after edit now
Some css improvements for receipt printing
Adaptation of one or more labels
2015-02-25 13:30:17 +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
6710112f3d Change to bc-style operations for totals calculation in receivings 2015-02-17 12:20:53 +01:00
jekkos-t520
0132c9092c Remove clear enable functions 2014-12-16 19:00:15 +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
0569275c4e Add receivings invoice number enable/disable
Ignore invoice number unique constraint when invoice is disabled
2014-12-06 10:46:16 +01:00
jekkos-t520
ee30b178b4 Remove duplicate statement from 2.3.1 sql upgrade script
Remove quantity column from database.sql
Update item import example with correct location id
Fix detailed report receipt links
2014-11-28 08:51:08 +01:00
jekkos-t520
b311eca62e Fix receiving_quantity error in receivings page 2014-11-26 08:17:43 +01:00
jekkos-t520
97d37b5ad9 Merge branch 'feature/sale_numbering'
Conflicts:
	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
	js/manage_tables.js
2014-11-25 17:20:05 +01:00
jekkos-t520
035f2ad946 Review receivings quantity mulitplier 2014-11-04 08:14:16 +01:00