Commit Graph

249 Commits

Author SHA1 Message Date
Florian
546b94f1e9 Create ftp_lang.php
Didn't translate this one yet, but will finish the job later ...
2014-12-31 14:55:55 +01:00
Florian
dbec337742 Create form_validation_lang.php
Translate form_validation_lang.php to French
2014-12-31 14:55:24 +01:00
Florian
e387ddaf1a Create email_lang.php
Didn't translate this one yet, but will finish the job later ...
2014-12-31 14:45:23 +01:00
Florian
2fc34a55b1 Create db_lang.php
Didn't translate this one yet, but will finish the job later ...
2014-12-31 14:44:43 +01:00
Florian
17b0f452ca Create date_lang.php
Translate date_lang.php to French
2014-12-31 14:43:12 +01:00
jekkos-t520
0f34a6ace4 Ignore receiving_quantity = 0 for receivings 2014-12-26 11:39:26 +01:00
jekkos-t520
58dc5e3062 Newly created item in sales module is auto added to sale again 2014-12-19 08:47:40 +01:00
jekkos-t520
c00c604c21 Fix tax inclusive pricing for non taxable customer
Show receiving quantity in receiving receipt
Allow to use invoice number as zero (a bug prevented 0 to be saved to
db, causing it to stop incrementing next time)
2014-12-18 19:55:20 +01:00
jekkos-t520
0132c9092c Remove clear enable functions 2014-12-16 19:00:15 +01:00
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-t520
62977bf89f Refresh only editd rows after bulk refresh 2014-11-25 08:32:55 +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
Florian
44515ee999 Update database.sql 2014-11-24 20:06:44 +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
jekkos
d6926fee9f Merge pull request #10 from flodef/patch-3
Update register.php
2014-11-20 10:15:49 +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
46af17845f Merge branch 'master' of https://github.com/jekkos/opensourcepos 2014-11-13 16:51:09 +01:00
jekkos-t520
2c706dc752 Rename receivings_quantity to receiving_quantity 2014-11-13 16:50:52 +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-t520
1b41c93441 Fix item row refresh in detailed receivings and sales 2014-11-07 18:03:45 +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