Rushabh Mehta
|
03e5ea3a0d
|
Merge pull request #6114 from hereabdulla/patch-1
Update employee_list.js
|
2016-08-18 14:05:58 +05:30 |
|
Rohit Waghchaure
|
9d5a07d101
|
[POS] Fixed stock update issue
|
2016-08-18 13:27:06 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Abdulla P I
|
23a6d05622
|
Update employee_list.js
|
2016-08-18 12:43:19 +05:30 |
|
Rushabh Mehta
|
b969c2cb60
|
[minor] budget link in cost center, fixes #6093
|
2016-08-18 12:36:20 +05:30 |
|
Ben Cornwell-Mott
|
a7c98ba0fe
|
More formatting adjustments
|
2016-08-17 05:56:00 -07:00 |
|
Ben Cornwell-Mott
|
d5a9d475e7
|
Adjusted formatting
|
2016-08-17 05:45:43 -07:00 |
|
Ben Cornwell-Mott
|
06bfecea73
|
Fixed formatting of code and repositioned checkboxes in PPT.
|
2016-08-17 05:42:25 -07:00 |
|
Neil Trini Lasrado
|
c4e71fcc51
|
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
|
2016-08-17 17:37:19 +05:30 |
|
Nabin Hait
|
b8a8fb5877
|
Merge branch 'develop'
|
2016-08-17 17:11:09 +05:30 |
|
Nabin Hait
|
734cf70b43
|
bumped to version 7.0.29
|
2016-08-17 17:41:09 +06:00 |
|
Nabin Hait
|
6fe3ac49cf
|
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
Allow to edit change amount
|
2016-08-17 17:08:54 +05:30 |
|
Rohit Waghchaure
|
e4e69ec027
|
changed field name, validation for change amount account, validation for serial no qty
|
2016-08-17 16:20:13 +05:30 |
|
Nabin Hait
|
386d9e1613
|
Merge pull request #6106 from nabinhait/item_reload
Default material request type field restored
|
2016-08-17 16:16:28 +05:30 |
|
Nabin Hait
|
40c60b6182
|
Default material request type field restored
|
2016-08-17 16:14:24 +05:30 |
|
Nabin Hait
|
95c998109d
|
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
Validate on changing from Total to Valuation/Valuation&Total when add…
|
2016-08-17 12:12:14 +05:30 |
|
Nabin Hait
|
33bcaa8a07
|
Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier
Quoted Item Comparison: Button for setting the default_supplier
|
2016-08-17 11:36:55 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|
Nabin Hait
|
c2595aa902
|
Merge pull request #6099 from nabinhait/patch_fix_for_v6_to_v7_migration
Patch fixed for v6 to v7 migration
|
2016-08-17 11:28:29 +05:30 |
|
Ben Cornwell-Mott
|
e977fc5dee
|
Upgraded PPT for more variety of MR creation options. Added tests
|
2016-08-16 06:01:52 -07:00 |
|
Nabin Hait
|
613ef344f3
|
Patch fixed for v6 to v7 migration
|
2016-08-16 18:31:26 +05:30 |
|
Nabin Hait
|
0c1be8df35
|
Merge pull request #6096 from rohitwaghchaure/minor_fix
[Fix] lwp salary structure
|
2016-08-16 18:17:14 +05:30 |
|
Nabin Hait
|
815ebafa7b
|
Merge pull request #6092 from umairsy/9aug
Updated docs (please don't merge)
|
2016-08-16 18:16:28 +05:30 |
|
Umair Sayyed
|
8f7708ed5b
|
docs updated
|
2016-08-16 18:13:12 +05:30 |
|
Umair Sayyed
|
1bd9f22add
|
updated docsgd
|
2016-08-16 18:08:24 +05:30 |
|
Umair Sayyed
|
f369b5951e
|
updated docs
|
2016-08-16 18:08:00 +05:30 |
|
Umair Sayyed
|
81995389ac
|
updated docs
|
2016-08-16 18:08:00 +05:30 |
|
Neil Trini Lasrado
|
999f34a568
|
Updated Docs for Schools Module
|
2016-08-16 17:50:08 +05:30 |
|
Rohit Waghchaure
|
fe913c9969
|
[Fix] lwp salary structure
|
2016-08-16 15:43:50 +05:30 |
|
Nabin Hait
|
18d6162935
|
Merge branch 'develop'
|
2016-08-16 15:25:34 +05:30 |
|
Nabin Hait
|
91d6544958
|
bumped to version 7.0.28
|
2016-08-16 15:55:33 +06:00 |
|
Nabin Hait
|
f640ad4389
|
Merge pull request #6095 from nabinhait/timesheet_patch
Ignore overlap validation while creating timesheet from existing time logs
|
2016-08-16 15:19:56 +05:30 |
|
Nabin Hait
|
39bc4b2a4c
|
Ignore overlap validation while creating timesheet from existing time logs
|
2016-08-16 15:18:28 +05:30 |
|
Rushabh Mehta
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Nabin Hait
|
df9cf2ef8e
|
Merge pull request #6068 from neilLasrado/develop
Added image field to guardian, program enrollment, fixed some typos
|
2016-08-16 11:01:58 +05:30 |
|
Nabin Hait
|
528ab53b3a
|
Merge pull request #6067 from rohitwaghchaure/pos_fixes
[POS] fixed issue of negative stock
|
2016-08-16 11:00:31 +05:30 |
|
Rohit Waghchaure
|
9cd356c7f0
|
[POS] Fixed print qty decimal issue
|
2016-08-16 10:44:21 +05:30 |
|
Rushabh Mehta
|
de08639d49
|
[minor] fixes to patches while moving from v5
|
2016-08-16 10:01:56 +05:30 |
|
Neil Trini Lasrado
|
987009bf35
|
Update quotation.json
|
2016-08-12 16:44:00 +05:30 |
|
Rushabh Mehta
|
c833cc8432
|
Merge branch 'develop'
|
2016-08-12 11:53:08 +05:30 |
|
Rushabh Mehta
|
3f22ec9536
|
bumped to version 7.0.27
|
2016-08-12 12:23:08 +06:00 |
|
Rushabh Mehta
|
d643f2b249
|
[minor] fixes #6074;
|
2016-08-12 10:36:59 +05:30 |
|
Ben Cornwell-Mott
|
b739dd24b2
|
Added a button to assist in setting the default_supplier
|
2016-08-11 19:45:55 -07:00 |
|
Neil Trini Lasrado
|
c917423b01
|
Fixed typo in quotation, added image feild in Program Enrollment
|
2016-08-11 18:22:45 +05:30 |
|
Neil Trini Lasrado
|
6a23016f90
|
Added image feild to guardian
|
2016-08-11 17:28:21 +05:30 |
|
Rushabh Mehta
|
730f3e7aba
|
[minor] remove validation #4904
|
2016-08-11 17:17:26 +05:30 |
|
Rohit Waghchaure
|
033ed00c56
|
[POS] fixed issue of negative stock
|
2016-08-11 16:37:29 +05:30 |
|
Rushabh Mehta
|
6c0d9579d2
|
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
[Fix] No permission to read DocType for account user in bank reconciliation statement report
|
2016-08-11 10:55:10 +05:30 |
|
Rushabh Mehta
|
09fc241d59
|
Merge pull request #6054 from rohitwaghchaure/purchase_invoice_accounting_issue_for_auto_stock
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
|
2016-08-11 10:54:40 +05:30 |
|