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 |
|
Nabin Hait
|
952c9cccfc
|
Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item
Default warehouse in Item master
|
2016-10-29 14:44:19 +05:30 |
|
Nabin Hait
|
5fc624b9ed
|
Update save_stock_settings.py
|
2016-10-29 14:43:58 +05:30 |
|
Kanchan Chauhan
|
4c22825f01
|
Default warehouse in Item master
|
2016-10-27 23:56:04 +05:30 |
|
Nabin Hait
|
72a1943c8e
|
Fixed version conflict
|
2016-10-26 16:41:21 +05:30 |
|
Nabin Hait
|
c5cbde273f
|
Change Logs for v7.1
|
2016-10-26 16:28:54 +05:30 |
|
Nabin Hait
|
fe86debf5d
|
[fix] Duplicate salary components
|
2016-10-24 17:47:18 +05:30 |
|
Nabin Hait
|
97fa119b37
|
Set prefered contact email in Employee
|
2016-10-19 18:26:01 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Rohit Waghchaure
|
ac9172f6df
|
[Fix] total projected qty
|
2016-10-19 15:06:30 +05:30 |
|
Faris Ansari
|
a0608d463a
|
[gantt] Gantt fixes (#6490)
* [gantt] fix Gantt Chart link in Modules
* [gantt] added field for Task dependent
|
2016-10-10 14:32:35 +05:30 |
|
Nabin Hait
|
fc2a9e64fc
|
Fixed version conflict
|
2016-10-07 17:09:28 +05:30 |
|
Nabin Hait
|
6aaa7d7742
|
Added missing file extension
|
2016-10-07 17:08:03 +05:30 |
|
Nabin Hait
|
df61513037
|
Fixed merge conflict
|
2016-10-07 17:05:00 +05:30 |
|
Nabin Hait
|
2f3a68b8d6
|
Added missing file extension
|
2016-10-07 17:03:37 +05:30 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +05:30 |
|
Nabin Hait
|
81754954cb
|
Update update_timesheet_communications
|
2016-10-07 16:08:44 +05:30 |
|
Nabin Hait
|
2907881dfb
|
Update update_timesheet_communications
|
2016-10-07 16:07:11 +05:30 |
|
Nabin Hait
|
0799969063
|
Update set_portal_settings.py
|
2016-10-07 14:55:17 +05:30 |
|
Nabin Hait
|
20e96b77bd
|
Update set_portal_settings.py
|
2016-10-07 14:54:28 +05:30 |
|
Nabin Hait
|
2f75b7b42e
|
Fixed merge conflict
|
2016-10-07 14:16:17 +05:30 |
|
Rohit Waghchaure
|
770d04e633
|
[Fix] sales order status showing completed, while it's status was to bill
|
2016-10-07 13:55:48 +05:30 |
|
Nabin Hait
|
1885207eca
|
Update and rename update_timesheet_modified_created to update_timesheet_communications
|
2016-10-07 12:54:04 +05:30 |
|
RobertSchouten
|
ef4e41380b
|
[fix] update timestamps and relink communication for timesheet
|
2016-10-07 11:01:12 +08:00 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
9501b38e8b
|
Update remove_doctypes_and_reports.py
|
2016-10-05 12:35:11 +05:30 |
|
Saurabh
|
f24d523fc9
|
[fix] currency symbol for total amount in JE
|
2016-10-04 11:29:26 +05:30 |
|
Nabin Hait
|
80499bb657
|
Fixed merge conflict
|
2016-09-29 14:18:53 +05:30 |
|
Rohit Waghchaure
|
4b24683c27
|
[Fix] added account for missing change amount account in the sales invoice
|
2016-09-29 12:55:48 +05:30 |
|
Rohit Waghchaure
|
0a6529a643
|
Remove time log, time log batch from Doc Field.
|
2016-09-28 13:03:42 +05:30 |
|
Nabin Hait
|
706612bcd4
|
Fixed version conflict
|
2016-09-26 18:11:56 +05:30 |
|
Nabin Hait
|
ad3e213b41
|
minor patch fixes
|
2016-09-26 18:00:13 +05:30 |
|
Rushabh Mehta
|
1f53aaf093
|
[minor] [patch] ignore_validate in update_portal_role
|
2016-09-24 00:21:53 +05:30 |
|
Rushabh Mehta
|
63cdbf08f9
|
[minor] [patch] ignore_validate in update_portal_role
|
2016-09-24 00:07:31 +05:30 |
|
Rushabh Mehta
|
fc800b3f2f
|
[enhance] added roles for portal users frappe/frappe#2091 (#6452)
|
2016-09-23 21:51:51 +05:30 |
|
Nabin Hait
|
5f825deadd
|
Fixed version conflict
|
2016-09-23 17:25:23 +05:30 |
|
Nabin Hait
|
147b288d66
|
Update repost_gle_for_pos_sales_return.py
|
2016-09-23 13:11:05 +05:30 |
|
Nabin Hait
|
6b4eb7f77f
|
Fixed version conflict
|
2016-09-23 12:16:31 +05:30 |
|
Nabin Hait
|
d03087d3ab
|
Patch fixed for legacy migration
|
2016-09-23 11:08:02 +05:30 |
|
Rushabh Mehta
|
301c8a94b8
|
[fix] [patch] update_lead_source
|
2016-09-21 12:00:58 +05:30 |
|
Rushabh Mehta
|
989a4849fe
|
[minor] patch fix for 6-7
|
2016-09-21 12:00:58 +05:30 |
|
Nabin Hait
|
d12990ff57
|
Update update_home_page.py
|
2016-09-20 18:20:58 +05:30 |
|
Nabin Hait
|
5cf5019b89
|
minor patch fix
|
2016-09-20 18:19:59 +05:30 |
|
Nabin Hait
|
b015f1b647
|
Fixed version conflict
|
2016-09-20 16:53:02 +05:30 |
|
Rohit Waghchaure
|
414199a5db
|
[Fix] Mode of payment issue
|
2016-09-19 23:43:47 +05:30 |
|
Rushabh Mehta
|
e35dbca01b
|
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
|
2016-09-19 15:03:57 +05:30 |
|
Rushabh Mehta
|
cf7a36ac26
|
[fix] fix patch to clear lead customization
|
2016-09-16 23:01:41 +05:30 |
|
Rushabh Mehta
|
59dc0ece9f
|
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 11:44:49 +05:30 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Rohit Waghchaure
|
a5de83351e
|
[Fix] Timesheet patch
|
2016-09-13 12:36:37 +05:30 |
|
Rohit Waghchaure
|
0568238786
|
rename total_billing_hours to total_billable_hours in timesheet doctype
|
2016-09-12 23:00:24 +05:30 |
|
Rohit Waghchaure
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Nabin Hait
|
e5d13f3156
|
Update set_student_guardian.py
|
2016-09-08 17:57:55 +05:30 |
|
Rohit Waghchaure
|
aaa6d1f1bc
|
patch fix
|
2016-09-08 12:34:36 +05:30 |
|
Nabin Hait
|
1bf8e70339
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:19:27 +05:30 |
|
Nabin Hait
|
7c9d981614
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:17:47 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
Neil Trini Lasrado
|
52891b55d2
|
Fixed Student Guardian patch - reload issue
|
2016-09-06 17:50:42 +05:30 |
|
Nabin Hait
|
f79d7188de
|
Patch fixed
|
2016-09-06 17:47:19 +05:30 |
|
Rohit Waghchaure
|
b44efef094
|
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:21:38 +05:30 |
|
Neil Trini Lasrado
|
6a95723a70
|
Fixed Student Guardian patch - permission issue
|
2016-09-06 17:11:13 +05:30 |
|
Neil Trini Lasrado
|
49da25dd57
|
Added patch
|
2016-09-06 15:45:17 +05:30 |
|
Nabin Hait
|
23d79b7059
|
fixed version conflict
|
2016-09-02 16:19:54 +05:30 |
|
Nabin Hait
|
88d7e419ad
|
Merge pull request #6263 from nabinhait/timesheet_fix_101
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 16:18:12 +05:30 |
|
Nabin Hait
|
54254cca58
|
Update set_party_name_in_payment_entry.py
|
2016-09-02 16:17:42 +05:30 |
|
Nabin Hait
|
142f14dd5c
|
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 14:47:14 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Rohit Waghchaure
|
d07557eaf6
|
[Fix] Updated timesheet status
|
2016-09-02 12:24:54 +05:30 |
|
Nabin Hait
|
5a101ef4c6
|
Fixed merge conflict
|
2016-09-01 12:43:24 +05:30 |
|
Rohit Waghchaure
|
86f143863f
|
[Patch] Check table exist
|
2016-09-01 12:37:20 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Nabin Hait
|
bb2bceef62
|
Merge pull request #6229 from rohitwaghchaure/pos_payment_issue
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-09-01 12:25:31 +05:30 |
|
Rohit Waghchaure
|
7f165f19d2
|
[Fix] Timesheet employee is missing in patch
|
2016-09-01 12:07:21 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Nabin Hait
|
16e15283b5
|
Imported unicode literals
|
2016-08-31 12:33:22 +05:30 |
|
Rohit Waghchaure
|
da7fb70009
|
[Patch] Fixed error unknown column 'type' in 'field list'
|
2016-08-30 01:41:35 +05:30 |
|
Kanchan Chauhan
|
145f87c068
|
'Type' field added to Salary Component
|
2016-08-29 15:26:57 +05:30 |
|
Rohit Waghchaure
|
69aebf4db5
|
fixes test cases, added patch
|
2016-08-26 13:18:14 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
fbe1563101
|
Merge pull request #6168 from rohitwaghchaure/hotfix
[POS] Fixed payment gl entry for sales return
|
2016-08-26 11:58:46 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rohit Waghchaure
|
0788ee62c1
|
Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'
|
2016-08-25 12:46:34 +05:30 |
|
Rushabh Mehta
|
b9b36a2062
|
[minor] update salary structure company if not set
|
2016-08-24 15:20:43 +05:30 |
|
Rushabh Mehta
|
caeb9dc025
|
[minor] update salary structure company if not set
|
2016-08-24 15:14:48 +05:30 |
|