Neil Trini Lasrado
|
6d0da98a78
|
Fixes to update student guardian name patch
|
2017-01-27 17:44:28 +05:30 |
|
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
|
710dc5392f
|
[merge]
|
2017-01-27 15:48:31 +05:30 |
|
Neil Trini Lasrado
|
15c5ae0918
|
Fix for update assessment modules patch
|
2017-01-24 10:28:49 +05:30 |
|
Kanchan Chauhan
|
c948a4fc92
|
Patch to update Salary Detail where Salary Component Abbr is null
|
2017-01-23 16:12:45 +05:30 |
|
Neil Trini Lasrado
|
d471ad2c45
|
Fix for update assessment modules patch
|
2017-01-23 14:59:19 +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
|
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 |
|
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
|
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 |
|
Nabin Hait
|
b064cf39c2
|
Merge branch 'develop' into fleet-moved-to-hr
|
2017-01-17 11:05:39 +05:30 |
|
Kanchan Chauhan
|
f80c2b9606
|
Fleet management moved to HR
|
2017-01-16 14:38:24 +05:30 |
|
Neil Trini Lasrado
|
38bd62d82d
|
Merge branch 'develop' into assessment
|
2017-01-16 12:23:51 +05:30 |
|
Rushabh Mehta
|
b92087cb2d
|
[cleanup] move contact, address to frappe 💥
|
2017-01-13 18:54:47 +05:30 |
|
Nabin Hait
|
448acf6f46
|
Merge branch 'master' into develop
|
2017-01-13 17:30:46 +05:30 |
|
Nabin Hait
|
e7cb911634
|
Salary Slip Patch Fixed
|
2017-01-13 17:30:06 +05:30 |
|
Nabin Hait
|
26ac85be5b
|
Merge branch 'master' into develop
|
2017-01-13 17:10:52 +05:30 |
|
Nabin Hait
|
b166caa9fb
|
Patch fixed
|
2017-01-13 17:09:57 +05:30 |
|
Nabin Hait
|
b251cd4ccb
|
Fixed merge conflict
|
2017-01-13 14:34:54 +05:30 |
|
Nabin Hait
|
e43a94de4b
|
Merge branch 'hotfix' into draft_status_issue_after_amend
|
2017-01-13 13:14:32 +05:30 |
|
Nabin Hait
|
9698f1b923
|
Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
Patch to add Start and End Date in Salary Slips
|
2017-01-13 12:53:15 +05:30 |
|
Rohit Waghchaure
|
29458836e4
|
[Fix] After amend the status become cancelled even if docstatus is zero
|
2017-01-13 12:51:19 +05:30 |
|
Kanchan Chauhan
|
b6114e672f
|
Patch to add Start and End Date in Salary Slips
|
2017-01-13 12:05:03 +05:30 |
|
Neil Trini Lasrado
|
a56224c03a
|
Rename Assessment to Assessment Plan
|
2017-01-09 18:26:03 +05:30 |
|
Neil Trini Lasrado
|
233ecfdd9c
|
Renamed min_score to threshold in Grading Scale
|
2017-01-09 18:26:03 +05:30 |
|
Neil Trini Lasrado
|
5c87455918
|
Patch for assessment module redesign
|
2017-01-09 18:26:03 +05:30 |
|
Nabin Hait
|
6e9d2a3c1f
|
fixed conflict
|
2017-01-09 17:21:34 +05:30 |
|
Nabin Hait
|
91621639e8
|
Reload in_standard_filter property
|
2017-01-06 12:54:16 +05:30 |
|
Nabin Hait
|
f327a58b7f
|
Merge branch 'master' into develop
|
2016-12-29 11:04:05 +05:30 |
|
Nabin Hait
|
11bde0ba14
|
Patch fixed
|
2016-12-29 10:58:05 +05:30 |
|
Nabin Hait
|
3bcf9b5e70
|
Fixed merge conflict
|
2016-12-27 14:30:17 +05:30 |
|
Rushabh Mehta
|
174c3478a1
|
[fix] item variants not directly shown in website due to route clash
|
2016-12-27 12:30:30 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Nabin Hait
|
c2d66bdfb2
|
Merge branch 'master' into develop
|
2016-12-23 16:45:09 +05:30 |
|
Nabin Hait
|
6104fdc579
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-22 17:49:46 +05:30 |
|
Nabin Hait
|
e7939fd87b
|
Merge branch 'master' into develop
|
2016-12-21 12:18:38 +05:30 |
|
Nabin Hait
|
b3943cb53a
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-21 12:04:39 +05:30 |
|
Rushabh Mehta
|
688f2284af
|
[minor] [patch]
|
2016-12-19 13:15:52 +05:30 |
|
Nabin Hait
|
201af80706
|
Fixed merge conflict
|
2016-12-13 14:30:32 +05:30 |
|
Nabin Hait
|
346a6a5d84
|
Update set_sales_person_status.py
|
2016-12-13 11:27:46 +05:30 |
|
Kanchan Chauhan
|
f0b0db444d
|
Added Is Active to Sales Person
|
2016-12-12 19:12:41 +05:30 |
|
Nabin Hait
|
3ef63bef02
|
Rename and merging of Item and Warehouse and patch to fix deleted bins
|
2016-12-12 15:37:52 +05:30 |
|
Nabin Hait
|
58667ab123
|
Fixed merge conflict
|
2016-12-09 15:49:24 +05:30 |
|
Nabin Hait
|
43df804176
|
Fixed renamed fieldname
|
2016-12-09 15:09:11 +05:30 |
|
Viet Pham
|
ddb856377c
|
Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null
|
2016-12-08 20:02:39 +07:00 |
|
Nabin Hait
|
288a18e0cc
|
Fixes and patch for Currency Exchange based on date
|
2016-12-08 15:36:23 +05:30 |
|
Nabin Hait
|
32e5b7af20
|
Update set_budget_against_as_cost_center.py
|
2016-12-08 14:42:04 +05:30 |
|
Manas Solanki
|
482fa672c2
|
[Fix] Patch for budget_against
|
2016-12-08 12:16:29 +05:30 |
|
Nabin Hait
|
5c18bd9b61
|
Fixed merge conflict
|
2016-12-06 16:16:58 +05:30 |
|
Rohit Waghchaure
|
82fa27c36f
|
[Fix] Status of sales order and purchase order
|
2016-12-05 16:32:23 +05:30 |
|
Nabin Hait
|
926d72424d
|
Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue
[Enhancement] Currency added in the BOM
|
2016-11-24 13:27:17 +05:30 |
|
Nabin Hait
|
a8333be6ad
|
Merge pull request #7023 from frappe/revert-7012-remove-count-star
Revert "[optimize] remove count(*) from queries"
|
2016-11-24 13:26:38 +05:30 |
|
Rushabh Mehta
|
5dd12cb4f0
|
Merge branch 'master' into develop
|
2016-11-22 23:18:29 +05:30 |
|
Rohit Waghchaure
|
334f032780
|
fix patch
|
2016-11-22 13:30:13 +05:30 |
|
Rohit Waghchaure
|
b1b328865e
|
[Enhancement] Currency added in the BOM
|
2016-11-22 12:52:20 +05:30 |
|
Rushabh Mehta
|
9872d8cdb5
|
Revert "[optimize] remove count(*) from queries"
|
2016-11-21 21:04:47 +05:30 |
|
Nabin Hait
|
d855167b9b
|
Fixed merge conflict
|
2016-11-21 19:13:22 +05:30 |
|
Nabin Hait
|
376e8945f7
|
Merge pull request #7014 from rohitwaghchaure/rename_autoname_field
patch for rename autoname field
|
2016-11-21 19:04:44 +05:30 |
|
Rohit Waghchaure
|
4810d1fa2d
|
patch for rename autoname field
|
2016-11-21 16:52:50 +05:30 |
|
Rushabh Mehta
|
75d455422a
|
[fix] [patch] rename_quality_inspection_field
|
2016-11-21 16:19:50 +05:30 |
|
Nabin Hait
|
d50d6a559c
|
Merge pull request #7012 from rmehta/remove-count-star
[optimize] remove count(*) from queries
|
2016-11-21 15:28:01 +05:30 |
|
Rushabh Mehta
|
5a258cbc2d
|
[optimize] remove count(*) from queries
|
2016-11-21 14:57:36 +05:30 |
|
Nabin Hait
|
c2f8dd71d7
|
Merge pull request #6965 from manassolanki/qa_redesign
[Fix] [Enhancement] Quality Inspection
|
2016-11-21 14:49:18 +05:30 |
|
Rushabh Mehta
|
e9fc31168d
|
[patch] reload desktop icon #6826
|
2016-11-21 14:29:31 +05:30 |
|
Rushabh Mehta
|
fe816c3852
|
[fix] [wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Nabin Hait
|
7fc05d6432
|
Update update_missing_salary_component_type.py
|
2016-11-17 12:16:52 +05:30 |
|
Nabin Hait
|
8af429da1f
|
Cleanup and fixes in quality inspection feature
|
2016-11-16 17:22:38 +05:30 |
|
Nabin Hait
|
6d04afc19d
|
fixed merge conflict
|
2016-11-16 12:56:31 +05:30 |
|
Nabin Hait
|
00e841d744
|
update missing salary component abbr
|
2016-11-16 12:55:17 +05:30 |
|
Rushabh Mehta
|
4bfa0748cd
|
[merge] master
|
2016-11-16 11:28:23 +05:30 |
|
Rushabh Mehta
|
8dfbe7c748
|
[fix] patch missing salary component type based on existing salary slips (#6955)
|
2016-11-16 11:18:20 +05:30 |
|
rohitwaghchaure
|
b3ba7f01ef
|
[Fix] PO status not changed as material return created against them (#6869)
|
2016-11-16 11:10:10 +05:30 |
|
Rushabh Mehta
|
e0ab64d6cc
|
[minor] reload user for patch
|
2016-11-15 16:43:37 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
256a3fef95
|
Fixed multiple minor issues
|
2016-11-14 11:10:50 +05:30 |
|
Nabin Hait
|
fa220f93be
|
Merge branch 'master' into develop
|
2016-11-10 11:25:33 +05:30 |
|
Nabin Hait
|
84ecaac27d
|
Update set_base_amount_in_invoice_payment_table.py
|
2016-11-10 11:24:22 +05:30 |
|
Nabin Hait
|
ceca1b97c3
|
Fixed merge conflict
|
2016-11-09 14:58:36 +05:30 |
|
Rohit Waghchaure
|
2285f90b64
|
added debit and credit note status
|
2016-11-09 14:47:24 +05:30 |
|
Rohit Waghchaure
|
2f1db57fe1
|
Added status field in sales invoice and purchase invoice
|
2016-11-08 18:49:58 +05:30 |
|
Nabin Hait
|
31f6436f75
|
[patch] Set base amount in Sales Invoice Payment table
|
2016-11-08 17:41:14 +05:30 |
|
Nabin Hait
|
a469e659c5
|
Fixed merge conflict
|
2016-11-08 15:26:27 +05:30 |
|
Nabin Hait
|
cdc895734f
|
Merge pull request #6819 from rohitwaghchaure/hotfix_issues
cleanup and fixes
|
2016-11-08 12:05:47 +05:30 |
|
robert schouten
|
d8bdaeffe3
|
[fix] include cancel time logs in convert and v6 to v7.1 fix (#6840)
|
2016-11-07 17:16:39 +05:30 |
|
robert schouten
|
27d45a244e
|
[fix]fix name definition in old patch (#6841)
|
2016-11-07 17:08:37 +05:30 |
|
Rohit Waghchaure
|
0ecad33642
|
cleanup and fixes
|
2016-11-05 08:09:21 +05:30 |
|
Nabin Hait
|
f4068fd6f1
|
Fixed merge conflict
|
2016-11-01 15:06:55 +05:30 |
|
Nabin Hait
|
c61892501c
|
[fix] Report GLE for Purchase Invoice with Update Stock option
|
2016-11-01 11:45:32 +05:30 |
|
Nabin Hait
|
551360ae30
|
Fixed merge conflict
|
2016-10-31 16:38:09 +05:30 |
|
Nabin Hait
|
f5f3ef1bae
|
repost gle for Purchase Invoice with update stock
|
2016-10-31 16:17:10 +05:30 |
|