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
jekkos-t520
31877528b1
Security update for report subpermissions
2014-10-17 08:29:46 +02:00
jekkos-t520
7fad710277
Reports module now has checks on the required submodules when entering direct urls
2014-10-16 18:31:35 +02:00
jekkos-t520
7bcb1d7531
Fix totals calculation in sales register
2014-10-16 08:23:47 +02:00
jekkos-t520
0863b4ebba
Add extra permissiosn checks to report methods
...
Adapt no_access page to show missing grant
Adapt Email library to customize return_path header
2014-10-16 08:20:36 +02:00
jekkos-t520
bc514889a8
Add detailed reports again (permission_id wasn't set properly)
...
Finish updqate script
2014-10-13 18:57:07 +02:00
jekkos-t520
868de15fcb
Invoice number is now substituted correctly after complete
...
Fix payments summary report
Update upgrade script (not tested yet)
2014-10-13 12:30:37 +02:00
jekkos-t520
dad16b7a71
Receivings comments and recv_invoice_format fields are updated on keyup now
2014-10-12 12:47:45 +02:00
jekkos-t520
de06b64e4e
Fix warning in specific discount report (add category to query)
...
Add grant for default stock location in sql
2014-10-12 03:18:19 +02:00
jekkos-t520
ac667a23dc
Refactor report listing (again)
...
All reports have proper permissions now (categories, taxes, discounts,..)
Minor refactoring and code cleanup
2014-10-12 02:54:54 +02:00
jekkos-t520
54fbb4e7d7
Refactor stock location save
...
Add config to permissions and grants in database script
2014-10-11 17:55:00 +02:00
jekkos-t520
cda41622e4
Merge branch 'refactor/module_permissions' into feature/invoice_numbering
...
Conflicts:
database/database.sql
2014-10-10 16:38:07 +02:00
jekkos-t520
802a0e6a59
Refactor report listing (move sales specific grants to employee model)
2014-10-09 17:56:24 +02:00
jekkos-t520
77222c1989
Fix supplier selection
2014-10-08 19:27:07 +02:00
jekkos-t520
bb9ab9bd9c
Finish stock location refactoring
...
Modules are inaccessible if permissions not configured correctly
2014-10-07 21:47:07 +02:00
jekkos-t520
a1eb735d96
Remove empty check for item_id and quantity_id when saving item_quantities
...
Add configuration key to database script
2014-10-07 08:27:31 +02:00
jekkos-t520
aee5f3d27e
Add ospos_grants table
...
Refactor permission and module system
2014-10-07 00:47:30 +02:00
jekkos-t520
97ff190ba5
Receivings can now use invoice numbers with a specified format (in config section)
...
Fix some more stock location related bugs
Some refactoring todo for creating/updating stock locations
2014-10-05 22:53:42 +02:00
jekkos-t520
1afbc03304
Merge branch 'feature/multistore_support' into feature/invoice_numbering
2014-10-04 16:49:22 +02:00
jekkos-t520
5e8367681b
Fix default location in items, sales and receivings
2014-10-04 13:38:52 +02:00
jekkos-t520
bac80e3a92
Added invoice_number field to receivings table
...
Save comments field in receivings as in sales
Add translations for cancel button in receivings
Add cascading deletes for ospos_permissions
2014-10-04 13:19:24 +02:00
jekkos-t520
5a4ac8dde3
Fix comments in receivings
2014-10-03 17:41:39 +02:00
