mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-23 08:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
240 Commits 37 Branches 39 Tags
efff9d20c1903e8a7ec9c370d7362023be30ab6b
Commit Graph

172 Commits

Author SHA1 Message Date
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
b546883d2a Dashes are allowed now in barcode text 
Update barcode with newer drop in version (thanks Odie)
 2014-12-15 00:09:44 +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
e3288ae759 Revert newly added receivings functionality 2014-12-04 23:23:10 +01:00
jekkos-t520
64f1b4191a Invoice number can now be enabled/disabled 
Invoice unique constraint only applies when enabling invoice
Correct several HTML structure errors in sale and order modules
Make the top module bar a bit wider
Fix payment details css when hiding/showing invoice number field
 2014-12-04 22:01:40 +01:00
jekkos-t520
1c1b89db21 Fix detailed sales report for sale_type = sale 2014-12-04 08:49:36 +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
44b5404fe7 Fix missing invoice number in sales receipt 2014-11-27 08:48:15 +01:00
jekkos-t520
78ca94e036 Fix detailed report editing 2014-11-27 08:44:50 +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
27e1bfe871 Merge pull request #11 from flodef/master 
Add record time to giftcard
 2014-11-26 08:55:49 +01:00
jekkos
7d70fa70a6 Merge pull request #13 from flodef/patch-3 
Update register.php
 2014-11-26 08:54:44 +01:00
jekkos-t520
6bd6080ccc Fix customer field focus in register screen 2014-11-26 08:25:45 +01:00
jekkos-t520
b311eca62e Fix receiving_quantity error in receivings page 2014-11-26 08:17:43 +01:00
jekkos-t520
99a804c1ac Fix item quantity after edit 2014-11-26 08:10:15 +01:00
jekkos-t520
5f3a81ee5c Merge branch 'master' of https://github.com/jekkos/opensourcepos 2014-11-25 23:04:25 +01:00
jekkos-t520
af8b88d030 Fix config module layout (wider + adapt setting labels) 2014-11-25 21:45:01 +01:00
Florian
08368b6279 Update register.php 
Correct an HTML mistake : replace </tr> by </td>
 2014-11-25 20:24:46 +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
969abe1d34 Merge pull request #7 from flodef/patch-1 
Update Sale_lib.php
 2014-11-25 11:35:07 +01:00
jekkos-t520
5a40c31af3 Merge branch 'fix/recv_amount_multiplication' 2014-11-25 08:43:10 +01:00
jekkos
f88baad4b7 Merge pull request #3 from songwutk/patch-2 
fix bug duplicate config
 2014-11-25 00:11:26 +01:00
Florian
27de99fe78 Update giftcards.php 
Add a "record_time" to the giftcard saving function to be know when a new giftcard has been added.
 2014-11-24 20:11:47 +01:00
jekkos
90c1934d92 Merge pull request #6 from curthauta/import_items 
fixed quantities on items import
 2014-11-20 10:19:41 +01:00
jekkos
bb3fbb03b1 Merge pull request #9 from flodef/patch-2 
Update register.php
 2014-11-20 10:17:39 +01:00
flodef
ba47d5e4ff Update register.php 
- Correct previous commit when it was impossible to set any value anymore (oooops, I went too quickly on this one)
- Use .val instead of .attr("value") because the latter is deprecated
 2014-11-14 22:40:36 +01:00
flodef
fe14180ec5 Update register.php 
- Remove unused variable : $cur_item_info
- Change .click for .focus : correct a bug when the text doesn't disappear on chrome after changing tab
 2014-11-14 22:30:16 +01:00
flodef
15d15b9750 Update register.php 
Price should have it's currency
 2014-11-14 20:31:04 +01:00
jekkos-t520
4893da0e43 Added enable invoice checkbox 2014-11-13 13:28:42 +01:00
flodef
26bee3e5a6 Update Sale_lib.php 
Clean "add_payment" to be simpler : don't need to declare $payment in the main as it used only to add to an existing array
Fix "edit_payment" that was trying to set a payment on the $payment_id (expected payment data : $payments)
 2014-11-11 13:04:27 +01:00
jekkos
1dd9a7ea2c Merge pull request #4 from songwutk/patch-3 
Update Thai translate
 2014-11-06 08:52:27 +01:00
jekkos
6286f6cc11 Merge pull request #2 from songwutk/patch-1 
Rename Thai menu (Gift Card)
 2014-11-06 08:14:11 +01:00
jekkos-t520
094a293c78 Fix invoice number insert in receivings 2014-11-06 07:35:54 +01:00
Curt Hauta
8ae21bbcb7 fixed quantities on items import 2014-11-05 20:01:25 -07:00
jekkos-t520
035f2ad946 Review receivings quantity mulitplier 2014-11-04 08:14:16 +01:00
jekkos-t520
54fe0c4c30 Fix sales/receivings deletion 2014-11-03 19:22:36 +01:00
jekkos-t520
d43015e8c9 Set default receivings value for items to 1 in database 
Fix item quantity save
 2014-11-03 18:08:57 +01:00
jekkos-t520
7a46078734 Add receivings_quantity to item form 
Conflicts:

	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
 2014-11-03 18:07:50 +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
songwutk
e5e74f3ffb Update Thai translate 
Update Thai translate
 2014-10-26 06:37:53 +07:00
songwutk
851333b72c fix bug duplicate config 
fix bug duplicate config & update thai translate
 2014-10-26 06:29:07 +07:00
songwutk
00045c3f97 Rename Thai menu (Gift Card) 2014-10-26 06:14:28 +07:00
jekkos-t520
cc9adeef47 Set supplier_info to default value (fix warning with empty supplier) 
Conflicts:

	application/controllers/receivings.php
 2014-10-23 21:32:19 +02:00
jekkos-t520
37c80deb83 Show error message correctly in receivings 2014-10-23 18:35:34 +02:00
jekkos-t520
9d765efc94 Add invoice number duplication check in receivings screen 
Add invoice number duplication check in receivings detailed report
 2014-10-23 18:02:33 +02:00
jekkos-t520
4e071c9fbb Fix blank page when returning receivings 
Conflicts:

	application/libraries/Receiving_lib.php
 2014-10-22 07:11:37 +02:00
jekkos-t520
fe6820920b Add edit form in detailed receivings report 
Add language lines for detailed sale & receiving validation
Add permission for getting updated sale & receiving detail row
 2014-10-21 21:39:22 +02:00
jekkos-t520
08dcd9e384 Fix totals calculation in receivings module 2014-10-20 18:31:33 +02:00