Neil Trini Lasrado
|
7ff5682193
|
Merge branch 'develop' into guarding-name
|
2017-01-27 16:54:50 +05:30 |
|
Neil Trini Lasrado
|
f36ff488c0
|
Added Guardian Name to Student Master
|
2017-01-27 16:53:55 +05:30 |
|
Rushabh Mehta
|
e239d4dfe9
|
Merge branch 'master' into develop
|
2017-01-27 16:18:26 +05:30 |
|
Rushabh Mehta
|
098bd34f00
|
bumped to version 7.2.17
|
2017-01-27 16:48:25 +06:00 |
|
Rushabh Mehta
|
063e86a1bf
|
[fix] remove on_update in Item
|
2017-01-27 16:16:08 +05:30 |
|
Rushabh Mehta
|
b5eaf324b3
|
Merge branch 'master' into develop
|
2017-01-27 16:03:30 +05:30 |
|
Rushabh Mehta
|
5f0027a2d0
|
bumped to version 7.2.16
|
2017-01-27 16:33:29 +06:00 |
|
Rushabh Mehta
|
fd82f4b0d4
|
[minor] fix for item_group.py
|
2017-01-27 16:00:47 +05:30 |
|
Rushabh Mehta
|
710dc5392f
|
[merge]
|
2017-01-27 15:48:31 +05:30 |
|
Rushabh Mehta
|
149c033c8f
|
bumped to version 7.2.15
|
2017-01-27 16:16:07 +06:00 |
|
Neil Trini Lasrado
|
7326217ab5
|
Added 'Active' checkbox in list view for Student Batch and Student Group
|
2017-01-27 14:50:48 +05:30 |
|
Neil Trini Lasrado
|
8c3fb43d8a
|
Fix- Student batch strength in Batch Wise attendance report
|
2017-01-27 14:13:25 +05:30 |
|
Kanchan Chauhan
|
3dd85a0e9e
|
Task rename now possible
|
2017-01-27 12:34:06 +05:30 |
|
Kanchan Chauhan
|
e877ecfb7b
|
[Fix] Permissions to view Leave Balance Report
|
2017-01-27 11:53:56 +05:30 |
|
Nabin Hait
|
355b4110c9
|
Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
[Fix] Get valuation rate from item master and update stock value difference
|
2017-01-25 19:21:04 +05:30 |
|
Nabin Hait
|
cb19f52985
|
Update stock_controller.py
|
2017-01-25 19:20:35 +05:30 |
|
Rohit Waghchaure
|
3899d74f15
|
[Fix] Get valuation rate from item master and update stock value difference
|
2017-01-25 18:47:53 +05:30 |
|
Nabin Hait
|
57e4ab70be
|
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
New screenshots for Calendar user manual
|
2017-01-25 17:35:01 +05:30 |
|
Nabin Hait
|
d288909310
|
Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
Patch to update Salary Detail where Salary Component Abbr is null
|
2017-01-25 17:23:43 +05:30 |
|
Kanchan Chauhan
|
ce116417e1
|
New screenshots for Calendar user manual
|
2017-01-25 15:38:35 +05:30 |
|
Ricardo Johann
|
34354237fd
|
added project filter to gl and carry project filter from P&L
|
2017-01-24 06:46:07 -03:00 |
|
vrms
|
1f1f56225c
|
Update warehouse.md (#7544)
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
|
2017-01-24 11:29:27 +05:30 |
|
KanchanChauhan
|
4333ce0fd8
|
Merge pull request #7569 from neilLasrado/assessment
Fix for update assessment modules patch
|
2017-01-24 10:52:50 +05:30 |
|
Neil Trini Lasrado
|
15c5ae0918
|
Fix for update assessment modules patch
|
2017-01-24 10:28:49 +05:30 |
|
Kanchan Chauhan
|
679cc23abb
|
[Fix] Naming series issue fix
|
2017-01-23 17:20:55 +05:30 |
|
Kanchan Chauhan
|
c948a4fc92
|
Patch to update Salary Detail where Salary Component Abbr is null
|
2017-01-23 16:12:45 +05:30 |
|
rohitwaghchaure
|
ab65f6d8b1
|
Merge pull request #7547 from mnatalia/develop
Added translations to the web page and item dashboard.
|
2017-01-23 15:57:33 +05:30 |
|
Neil Trini Lasrado
|
d471ad2c45
|
Fix for update assessment modules patch
|
2017-01-23 14:59:19 +05:30 |
|
Makarand Bauskar
|
01eefafad5
|
[minor] minor fixes in opportunity form (#7549)
|
2017-01-23 12:15:36 +05:30 |
|
Rushabh Mehta
|
397e508fc0
|
[fix] sales_partner.js, fixes #7553
|
2017-01-21 16:58:57 +05:30 |
|
Nabin Hait
|
1f9d1bb877
|
Merge branch 'develop' into assessment
|
2017-01-20 20:09:44 +05:30 |
|
Neil Trini Lasrado
|
16d40cf0a3
|
Added ability to disable a student in student group/studnet batch
|
2017-01-20 19:33:09 +05:30 |
|
Nabin Hait
|
349d520ae2
|
Fixed merge conflict
|
2017-01-20 15:44:35 +05:30 |
|
Nabin Hait
|
a1d3d84415
|
bumped to version 7.2.14
|
2017-01-20 16:10:35 +06:00 |
|
Nabin Hait
|
c1cc7b68c4
|
Merge pull request #7522 from nabinhait/hotfix
Get valuation rate from Item while not found based on SLE
|
2017-01-20 15:39:24 +05:30 |
|
mnatalia
|
e09407571c
|
Added translations to the web page and item dashboard.
|
2017-01-20 12:00:25 +02:00 |
|
Nabin Hait
|
4c952f48f8
|
Some minor fixes
|
2017-01-20 15:15:31 +05:30 |
|
Nabin Hait
|
bd1a628c55
|
Merge pull request #7545 from rohitwaghchaure/minor_issue
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
|
2017-01-20 14:36:48 +05:30 |
|
Rohit Waghchaure
|
93c001455f
|
[Fix] Account user not able to access the report
|
2017-01-20 14:18:17 +05:30 |
|
Nabin Hait
|
548cf183ea
|
Merge pull request #7543 from RobertSchouten/leave_allocation_fix
[fix] remove invalid parameter from leave allocation
|
2017-01-20 12:54:55 +05:30 |
|
Nabin Hait
|
153156e31a
|
Merge pull request #7529 from rohitwaghchaure/budget_issue
[Fix] Budget not working properly
|
2017-01-20 12:54:29 +05:30 |
|
Nabin Hait
|
a0b967f2cd
|
Get valuation rate from Item while not found based on SLE
|
2017-01-20 12:50:40 +05:30 |
|
Nabin Hait
|
f356e539bb
|
Update set_null_value_to_fields.py
|
2017-01-20 12:35:22 +05:30 |
|
Rohit Waghchaure
|
84b827efcd
|
[Fix] Budget not working properly
|
2017-01-20 12:33:50 +05:30 |
|
robert schouten
|
e14e042f2f
|
[fix] remove invalid parameter from leave allocation
|
2017-01-20 15:02:00 +08:00 |
|
Nabin Hait
|
bfcacbf2ca
|
Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue
[Fix] Minor issue in landed cost voucher
|
2017-01-20 12:12:17 +05:30 |
|
Rohit Waghchaure
|
a3a977d02a
|
[Fix] Minor issue in landed cost voucher
|
2017-01-19 18:38:53 +05:30 |
|
Kanchan Chauhan
|
03dc695c77
|
[Minor] Set website warehouse as default warehouse
|
2017-01-19 14:57:05 +05:30 |
|
Rushabh Mehta
|
c81621d3ce
|
[minor] add progress bar in patch
|
2017-01-19 14:32:36 +05:30 |
|
Rushabh Mehta
|
00d3cd6d64
|
[fix] contact address link patch
|
2017-01-19 14:27:02 +05:30 |
|
Rushabh Mehta
|
818af75575
|
[patch] add patch for contact_address_update
|
2017-01-19 13:08:46 +05:30 |
|
Rushabh Mehta
|
d69fd1b8c0
|
[fix] update_salary_slip.py
|
2017-01-19 12:51:37 +05:30 |
|
Rushabh Mehta
|
683d98fd54
|
[fix] update_salary_slip.py
|
2017-01-19 12:48:03 +05:30 |
|
Rushabh Mehta
|
35e4d8b152
|
[fix] update_salary_slip.py
|
2017-01-19 12:47:27 +05:30 |
|
Rushabh Mehta
|
60908f4a08
|
[fix] update_salary_slip.py
|
2017-01-19 12:46:11 +05:30 |
|
Rushabh Mehta
|
26fdb113a8
|
[fix] update_salary_slip.py
|
2017-01-19 12:44:54 +05:30 |
|
Kanchan Chauhan
|
45c14ed41c
|
[Minor] Date fix in Production Order
|
2017-01-19 12:22:04 +05:30 |
|
Nabin Hait
|
eb80fdef82
|
Merge pull request #7520 from RobertSchouten/heatmap_limit_dev
[fix] accounts heatmaps now covering 366 days not 20
|
2017-01-19 09:15:20 +05:30 |
|
Nabin Hait
|
6b3670848e
|
Merge pull request #7477 from rmehta/custom-perms
[minor] fix for custom perms
|
2017-01-18 17:03:58 +05:30 |
|
Rohit Waghchaure
|
56cc542eb7
|
[Fix] sales return discount issue
|
2017-01-18 14:50:24 +05:30 |
|
Rushabh Mehta
|
a0c41b70c4
|
[fix] tax rule test
|
2017-01-18 14:14:20 +05:30 |
|
Rohit Waghchaure
|
2b97cee32c
|
[Fix] POS print issue
|
2017-01-18 13:21:27 +05:30 |
|
robert schouten
|
c0888637cc
|
[fix] accounts heatmaps now covering 366 days not 20
|
2017-01-18 15:25:58 +08:00 |
|
Rushabh Mehta
|
8f55d6bf3a
|
[fix] test_shopping_cart.py
|
2017-01-17 22:15:17 +05:30 |
|
Rushabh Mehta
|
d14a6c058a
|
[fix] stop recursion while adding role
|
2017-01-17 18:46:37 +05:30 |
|
Rushabh Mehta
|
982be9f11b
|
[tests] fixed for shopping cart
|
2017-01-17 17:57:38 +05:30 |
|
Rushabh Mehta
|
7385b73449
|
[fix] test
|
2017-01-17 17:57:38 +05:30 |
|
Nabin Hait
|
dd839055e3
|
Fixed merge conflict
|
2017-01-17 15:52:56 +05:30 |
|
Nabin Hait
|
aff2b9479d
|
bumped to version 7.2.13
|
2017-01-17 16:22:25 +06:00 |
|
Nabin Hait
|
f8676b2058
|
Create Material Requests considering projected qty of items
|
2017-01-17 14:11:43 +05:30 |
|
Ben Cornwell-Mott
|
5597f6a830
|
Fixes counting of in stock parent assemblies and formatting of csv
|
2017-01-17 14:11:43 +05:30 |
|
Kanchan Chauhan
|
653303180a
|
[Minor] Payroll Fix
|
2017-01-17 13:54:55 +05:30 |
|
Nabin Hait
|
1c91dc4589
|
Merge pull request #7475 from RobertSchouten/profitability_order
[fix] profiability analasyis orderby name
|
2017-01-17 12:39:24 +05:30 |
|
Nabin Hait
|
d9e216878f
|
Merge pull request #7513 from rohitwaghchaure/paid_amount_copy_issue
[Fix] Calculate paid amount when is pos is enabled
|
2017-01-17 12:38:09 +05:30 |
|
Nabin Hait
|
9e294ee454
|
Merge branch 'rfq_supplier_pull' into develop
|
2017-01-17 12:26:09 +05:30 |
|
Nabin Hait
|
2ad62c2892
|
In RFQ, get items from material requests based on possible supplier
|
2017-01-17 12:25:33 +05:30 |
|
Rohit Waghchaure
|
f58cad6b13
|
[Fix] Calculate paid amount when is pos is enabled
|
2017-01-17 12:11:57 +05:30 |
|
Rushabh Mehta
|
592104ef68
|
[fix] tests
|
2017-01-17 12:06:53 +05:30 |
|
Nabin Hait
|
7c7b3c0ab4
|
Merge pull request #7465 from KanchanChauhan/attendance-enhancement
[Enhancement] Attendance Module
|
2017-01-17 11:47:02 +05:30 |
|
Nabin Hait
|
0681c77f6a
|
Merge pull request #7506 from mntechnique/hotfix
[Fix] Project: Enabled autocomplete for project users
|
2017-01-17 11:27:37 +05:30 |
|
Nabin Hait
|
2dab8809e7
|
Merge pull request #7509 from kickapoo/develop
Add Full Name as option in HR Setting Employee creation option
|
2017-01-17 11:26:25 +05:30 |
|
Dhaifallah Alwadani
|
9eb830ac4f
|
fix string translation
|
2017-01-17 11:13:57 +05:30 |
|
Nabin Hait
|
bf01958b85
|
Merge pull request #7510 from dalwadani/develop
fix string translation
|
2017-01-17 11:12:15 +05:30 |
|
Nabin Hait
|
b064cf39c2
|
Merge branch 'develop' into fleet-moved-to-hr
|
2017-01-17 11:05:39 +05:30 |
|
Nabin Hait
|
03f82240fa
|
Merge pull request #7222 from neilLasrado/assessment
Redesign Assessment Module
|
2017-01-17 11:04:02 +05:30 |
|
Dhaifallah Alwadani
|
9375d1dfeb
|
fix string translation
|
2017-01-16 04:05:40 -08:00 |
|
Stavros Anastasiadis
|
241e478dc0
|
Add Full Name as option in HR Setting Employee creation option
|
2017-01-16 14:02:28 +02:00 |
|
Rushabh Mehta
|
ffd80a6061
|
[fix] warehouse test cases
|
2017-01-16 17:23:20 +05:30 |
|
Rushabh Mehta
|
6695830f3f
|
[fix] warehouse test cases
|
2017-01-16 16:57:53 +05:30 |
|
Gaurav Naik
|
d9b4c52046
|
[Fix] Project: Enabled autocomplete for project users
|
2017-01-16 16:01:25 +05:30 |
|
Kanchan Chauhan
|
f80c2b9606
|
Fleet management moved to HR
|
2017-01-16 14:38:24 +05:30 |
|
Rushabh Mehta
|
8d39fd9790
|
[fix] address queries + tests
|
2017-01-16 13:06:15 +05:30 |
|
Nabin Hait
|
120461efef
|
Merge branch 'master' into develop
|
2017-01-16 13:04:54 +05:30 |
|
Nabin Hait
|
71a730a36f
|
bumped to version 7.2.12
|
2017-01-16 13:34:53 +06:00 |
|
KanchanChauhan
|
b89be1e193
|
[Minor] Demo fixes (#7499)
|
2017-01-16 12:57:14 +05:30 |
|
Neil Trini Lasrado
|
38bd62d82d
|
Merge branch 'develop' into assessment
|
2017-01-16 12:23:51 +05:30 |
|
Rushabh Mehta
|
4ad121e1a4
|
[minor] fixes for Contact
|
2017-01-16 12:19:21 +05:30 |
|
ci2014
|
820abd3ba4
|
Fix missing comma (#7495)
Fixed missing comma after method set_contact_link
|
2017-01-16 11:57:34 +05:30 |
|
Nabin Hait
|
47bdf8b659
|
Merge pull request #7490 from rohitwaghchaure/pos_discount_issue
[Fix] Discount not working in the POS
|
2017-01-16 11:44:50 +05:30 |
|
Rohit Waghchaure
|
685f89f2b7
|
[Fix] Discount not working in the POS
|
2017-01-14 20:47:56 +05:30 |
|