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
Nabin Hait
5c9a2b39bc
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
2016-08-22 14:36:33 +05:30
Nabin Hait
1b9f8006c2
Merge pull request #6140 from nabinhait/timesheet_patch_fix
...
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:36:08 +05:30
Nabin Hait
9239ed5c44
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:35:06 +05:30
Nabin Hait
6b3706aef8
Update move_employee_parent_to_child_in_salary_structure.py
2016-08-18 17:32:53 +05:30
Nabin Hait
b5951b72f3
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
...
Formula based Salary Structure
2016-08-18 16:39:58 +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
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
613ef344f3
Patch fixed for v6 to v7 migration
2016-08-16 18:31:26 +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
Rushabh Mehta
de08639d49
[minor] fixes to patches while moving from v5
2016-08-16 10:01:56 +05:30
Rushabh Mehta
36f2d4f81e
[fix] patch for schools;
2016-08-10 19:46:12 +05:30
Rushabh Mehta
4b08f9ad1f
[fix] patch
2016-08-10 18:18:14 +05:30
Rushabh Mehta
cc054a5bbc
[minor] fix reload for school migrate patch
2016-08-10 14:24:16 +05:30
Nabin Hait
f44b5152d2
Portal settings for schools
2016-08-09 17:08:13 +05:30
Nabin Hait
11d565b07c
Update migrate_schools_to_erpnext.py
2016-08-09 15:23:01 +05:30
Nabin Hait
2275cd15e6
[patch] Reload Purchase Invoice in patch
2016-08-09 14:21:29 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Neil Trini Lasrado
50b2278eda
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
2016-08-05 15:09:49 +05:30
Nabin Hait
ae921ce2c8
[patch] Set default material request type in Item based on default bom
2016-08-02 18:02:31 +05:30
Neil Trini Lasrado
5bb2f56b47
Update make_guardian.py
2016-08-02 00:01:00 +05:30
Nabin Hait
3b8109780f
[patch] reload guardian interest
2016-08-01 17:59:46 +05:30
Nabin Hait
08aec855c4
[patch] fixed reload doc and permission issue in guardian patch
2016-08-01 17:46:56 +05:30
Nabin Hait
29a8a93aa1
Run guardian patch only if student doctype exists and there is father_name column
2016-08-01 17:31:17 +05:30
Nabin Hait
c9d04ab1fc
Merge pull request #5952 from nabinhait/lcv_reference
...
[patch] Update refdoc in Landed Cost Voucher
2016-08-01 16:23:33 +05:30
Nabin Hait
6f84026c24
Merge pull request #5951 from nabinhait/patch_fix_104
...
[patch] Reload RFQ and timesheet before removing customer/supplier roles
2016-08-01 16:15:47 +05:30
Nabin Hait
3c364dd5b8
[patch] Update refdoc in Landed Cost Voucher
2016-08-01 15:53:36 +05:30
Nabin Hait
5940dc1a8e
[patch] Reload RFQ and timesheet before removing customer/supplier roles
2016-08-01 15:30:44 +05:30
Neil Trini Lasrado
74dbd168c2
[new Feature] Added guardian master
2016-08-01 15:08:04 +05:30
Nabin Hait
e9674f8866
Create columns for custom fields in new table Salary Detail and Component
2016-08-01 12:13:11 +05:30
Nabin Hait
feed313a66
Delete old salary earning and deduction doctypes
2016-08-01 11:54:19 +05:30
Nabin Hait
fa97b3cac7
[fix] repost gle only if there is any stock account without warehouse
2016-07-27 17:33:32 +05:30
Nabin Hait
b4bf757a15
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
2016-07-27 15:19:12 +05:30
Nabin Hait
10007ab4df
[fix] reposting of gle where stock account not linked with warehouse
2016-07-27 12:43:02 +05:30
Nabin Hait
444bedcd20
Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account
2016-07-27 12:33:10 +05:30
Rohit Waghchaure
c4afd63e50
[minor] Fixes
2016-07-26 20:47:42 +05:30
Rohit Waghchaure
4d3e8da4a2
[Fix] Set warehouse to stock account and fixed gl entries against transactions.
2016-07-26 17:09:33 +05:30
Saurabh
21a5658fdf
[fix] fee component rename patch fix
2016-07-26 15:03:41 +05:30
Rohit Waghchaure
8a9daece7e
[Fix] Timesheet patch
2016-07-26 12:57:05 +05:30
Rohit Waghchaure
26cf01aaba
[mionr] fixes and cleanups
2016-07-26 00:30:25 +05:30
Neil Trini Lasrado
ce1c63f776
[rename] Renamed Fee Amount to Fee Component
2016-07-25 18:24:37 +05:30
Neil Trini Lasrado
d69d961f2a
Removed Administrator role from Doctypes
2016-07-25 11:39:23 +05:30
Rushabh Mehta
e7399dff2d
[fix] homepage patch
2016-07-22 21:01:39 +05:30
Rushabh Mehta
6207883b7c
[fix] patch #5831
2016-07-22 12:20:52 +05:30
Rushabh Mehta
04a64a7f48
[fix] patch #5831
2016-07-22 12:19:18 +05:30
Rushabh Mehta
f276b52af3
[fix] patch #5831
2016-07-22 11:31:51 +05:30
Rushabh Mehta
d4f3c6b5e7
[fix] schools patch
2016-07-21 18:22:58 +05:30
Rushabh Mehta
39671e22c9
[fix] patch
2016-07-21 17:14:27 +05:30
Rushabh Mehta
fe7d6932ee
[fix] patch
2016-07-21 17:12:47 +05:30
Neil Trini Lasrado
a537e43838
Fixed patch for migrating schools to erpnext again
2016-07-21 16:57:04 +05:30
Neil Trini Lasrado
af5e00363a
Fixed patch for migrating schools to erpnext
2016-07-21 16:41:05 +05:30
Rushabh Mehta
20038ad2c9
[fixes] setup wizard and domainify for schools;
2016-07-21 16:01:59 +05:30
Neil Trini Lasrado
3f0a581b85
Merge ERPNext Schools into ERPNext
2016-07-20 19:25:02 +05:30
Nabin Hait
9a5dc452f1
Patch fixed for expense claim type
2016-07-20 12:16:35 +05:30
Saurabh
718d835f45
[enhance] Add Accounts table in to mention expense account based on company #5777
2016-07-19 11:38:16 +05:30
Saurabh
c63f2e2993
[fix] patch fix
2016-07-14 18:24:20 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Rushabh Mehta
62fcaa7900
Merge pull request #5758 from saurabh6790/is_group_fixes
...
[fix] alter fieldtype for is_group from select to check
2016-07-14 16:57:01 +05:30
Rohit Waghchaure
de8418efe5
[Fix] Timesheet patch
2016-07-14 14:36:47 +05:30
Saurabh
6bc7b892c4
[fix] alter fieldtype for is_group from select to check
2016-07-14 14:06:28 +05:30
Rohit Waghchaure
e3fe828ea6
[Fix] Added note in timesheet and minor fixes
2016-07-13 09:40:35 +05:30
Rohit Waghchaure
3e012b7e16
[Fix] Time sheet rename issues
2016-07-11 15:00:38 +05:30
Rohit Waghchaure
e94d18b4cd
Rename Time Sheet doctype
2016-07-06 20:38:50 +05:30
Nabin Hait
7796c2f0c0
Update rename_salary_components.py
2016-07-06 13:11:51 +05:30
Rohit Waghchaure
c8d231b26b
[Fix] Patch salary component
2016-07-06 12:33:54 +05:30
Rohit Waghchaure
a71d9d33af
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:13:29 +05:30
Nabin Hait
4647f24865
Merge pull request #5625 from KanchanChauhan/salary-component-cleanup
...
Salary component cleanup
2016-07-06 12:06:05 +05:30
Kanchan Chauhan
d963b76a4b
Salary component cleanup
2016-07-06 12:04:38 +05:30
Nabin Hait
281b07cdb6
Warehouse patch fix
2016-07-04 18:17:57 +05:30
Nabin Hait
7f3938b19f
Warehouse patch fix
2016-07-04 18:12:08 +05:30
Rohit Waghchaure
240407b155
[Fixes] Time log batch patch
2016-07-04 13:21:54 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Rushabh Mehta
4177504860
[fix] [patch] reload doctype missing in patch
2016-07-04 11:41:12 +05:30
Rushabh Mehta
6703792472
Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes
...
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
2016-07-04 10:59:11 +05:30
Rohit Waghchaure
ad884b9fa9
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
2016-07-02 22:28:29 +05:30
Rohit Waghchaure
4d8f4d76e1
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
2016-07-01 15:33:57 +05:30
Rushabh Mehta
5b681666a0
Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1
...
while creating warehouse tree check for non company warehouse and is_group default value fix
2016-06-29 21:58:31 +05:30
Rohit Waghchaure
3fa0b51e5e
[Fixes] Time sheet fixes and changed timesheets to time_logs
2016-06-29 19:04:16 +05:30
Saurabh
028bbee317
[fix] nestedset warehouse fix
2016-06-29 19:03:40 +05:30
Saurabh
b8a57a4b4d
[fix] wareehouse nestedset fix if company not associated with warehouse
2016-06-29 19:01:49 +05:30
Rushabh Mehta
e6920f6a58
Merge pull request #5603 from KanchanChauhan/Maintenance-Module
...
New Maintenance Module
2016-06-29 16:08:46 +05:30
Kanchan Chauhan
fb3eb13ca4
New Maintenance Module
2016-06-29 15:51:02 +05:30
Anand Doshi
5b9c6e7fa6
[fix] [patch] remove default activity type "Planning"
2016-06-29 15:32:36 +05:30
Rushabh Mehta
26a76fb2d9
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
...
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Saurabh
ee17e2f277
[fix] patch fix
2016-06-28 15:43:02 +05:30
Saurabh
52c2affc9c
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
2016-06-28 14:41:48 +05:30
Saurabh
2f788a909f
[fixes] time sheet patch fix
2016-06-27 17:44:12 +05:30
Saurabh
93d68ac0c2
[fixes] change is group to check box
2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7
[fix] provision to convert group to ledger and vice versa
2016-06-27 17:16:56 +05:30
Rohit Waghchaure
d6c986da8f
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 16:46:39 +05:30
Saurabh
7fecb50360
[enhance] rename warehouse account type to stock
2016-06-26 14:27:46 +05:30
Anand Doshi
f576f3b17b
implemented get_site_info for erpnext and patch to move setup complete to system settings
2016-06-25 19:52:26 +05:30
Saurabh
dc2fa86222
[fixes] rename ctype to doctype
2016-06-25 11:16:55 +05:30
Saurabh
3a0f96bd00
[patch] patch to move all warehouses under all warehouse group
2016-06-25 11:06:14 +05:30
Saurabh
4d02949814
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
2016-06-25 11:06:14 +05:30
Saurabh
554f6f70aa
[fixes] nested set fix for warehouse, tree for accounts and cost center
2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb
[fixes] comnify tree view
2016-06-25 11:06:13 +05:30
Saurabh
dfbcdeb8a0
[enhancement] warehouse tree structure
2016-06-25 11:06:12 +05:30
Rushabh Mehta
994fa8dcef
Merge pull request #5530 from rmehta/website-route-fixes
...
[redesign] website routing system
2016-06-24 16:37:43 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Nabin Hait
438565f678
Merge branch 'master' into develop
2016-06-24 16:12:26 +05:30
Nabin Hait
0bfd4849ca
minot fix
2016-06-24 16:04:31 +05:30
Nabin Hait
2effad33d0
Merge branch 'master' into develop
2016-06-24 12:48:24 +05:30
Nabin Hait
6dfc78b12a
Item Valuation Rate in case of negative inventory
2016-06-24 12:28:55 +05:30
Rushabh Mehta
1d1bc27a57
[minor] fix update_mins_to_first_response patch
2016-06-14 16:27:50 +05:30
Rushabh Mehta
a55fb6426c
[patch] mins_to_first_response in opporutnity and issue
2016-06-14 15:54:54 +05:30
Rushabh Mehta
277cda195c
[fix] for #5419
2016-06-01 12:29:08 +05:30
Nabin Hait
a60ceba6d4
[fix] reload gl entry doctype in patch
2016-05-27 12:44:18 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Rushabh Mehta
1885645d6d
[fix] [patch]
2016-05-24 16:10:21 +05:30
Nabin Hait
d9117cb726
reload budget doctype in patch
2016-05-23 13:04:26 +05:30
Nabin Hait
ca90963d5b
Redesigned budgets
2016-05-23 13:04:26 +05:30
Anand Doshi
1d88c6a742
[fix] [patch] home page + erpnext.css
2016-05-20 10:42:04 +05:30
Anand Doshi
e13c3ad048
[fix] [patch] homepage
2016-05-18 01:46:23 +05:30
Anand Doshi
0d66260d31
[fix] [patch] update home page
2016-05-17 10:21:08 +05:30
Rushabh Mehta
02f76dc0f9
[patch] [fix]
2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496
[patch] [fix]
2016-05-16 11:41:29 +05:30
Rushabh Mehta
c8b2a9d654
[patch] [fix]
2016-05-15 10:08:52 +05:30
Rushabh Mehta
9c6c0d2836
[patch] [fix]
2016-05-13 17:50:33 +05:30
Rushabh Mehta
d774f40497
remove print in homepage
2016-05-13 16:21:37 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Nabin Hait
f3bff49799
Merge branch 'master' into develop
2016-05-02 15:19:17 +05:30
Valmik Jangla
651dc5b345
Reset Values in Tools
2016-05-02 12:00:06 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Nabin Hait
867dfec64b
Reload bin in reserved qty reposting patch
2016-04-20 11:53:34 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Rushabh Mehta
c65726bf07
[patch] hide new icons if equivalent old ones are set
2016-04-15 12:51:28 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9
[enhancement] heatmaps on item and notifications for item
2016-04-14 17:30:53 +05:30
Nabin Hait
e1433aab30
[fix] Fixed party update status patch
2016-04-09 16:12:40 +05:30
Rushabh Mehta
f16f9c569b
[enhancement] add status in customer, supplier
2016-04-08 17:21:00 +05:30
Anand Doshi
4b207647db
[fix] sanitize html of product bundle description
2016-04-05 18:34:11 +05:30
Nabin Hait
3a15c92c5e
Fixed Asset Depreciation first commit
2016-03-29 11:54:37 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
Rushabh Mehta
79a6fc9a84
[fix] recurring patch for purchase
2016-03-22 11:01:31 +05:30
Nabin Hait
2646f84a30
[patch] Fix delivery and billing status of recurring orders
2016-03-21 15:22:31 +05:30
Rushabh Mehta
7364f0cf1c
[patch-fix] remove old patches for web-forms
2016-03-21 14:47:35 +05:30
Nabin Hait
9a75530c26
[fix] reload doctype for renaming project
2016-03-18 16:19:25 +05:30
Saurabh
0f063a5f46
[patch] map customer_address to shipping_address and customer_address_display to shipping_address_display
2016-03-16 16:23:30 +05:30
Nabin Hait
a61930e7a7
[fix] reload doctype forcefully to rename project field
2016-03-16 12:29:32 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Anand Doshi
f319206d22
[fix] [hot] reload doctype Holiday List
2016-03-11 19:45:28 +05:30
Anand Doshi
4284fcf2a6
[fix] additional fixes for removal of Fiscal Year form Holiday List
2016-03-11 17:16:30 +05:30
shreyas
6f8dfa4c8d
[Minor] Fix print settings for custom print format
2016-03-07 18:22:40 +05:30
Rushabh Mehta
69cfab8559
[fix] [patch] recurring
2016-03-03 10:37:45 +05:30
Rushabh Mehta
5839a8d7f0
[fixes] usability cleanup of recurring document and added explicit submit_on_creation
2016-03-02 17:51:52 +05:30
Nabin Hait
5a4c7d3b62
[patch] repost valuation rate for serialized items
2016-02-29 12:07:42 +05:30
Nabin Hait
737849a0f5
[patch] Update stopped status to close
2016-02-25 15:16:02 +05:30
Neil Trini Lasrado
f79760ce2d
Mumtiple fixes
2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
abd9248ba6
Rename sales_order_no to sales_order in Material Request Item
2016-02-23 18:35:43 +05:30
Rushabh Mehta
3cdf3544fb
[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue
2016-02-08 18:50:40 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Anand Doshi
9c24bec654
Merge branch 'nabinhait-mc_fix_5' into develop
2016-01-29 12:16:35 +05:30
Nabin Hait
ee8f88d641
[patch] Set party account currency in existing orders
2016-01-27 16:01:31 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
Nabin Hait
e6b52bbb43
Update create_manufacturer_records.py
2016-01-21 00:30:39 +05:30
Nabin Hait
a613ea8abf
[patch] Create manufacturer records
2016-01-20 18:32:37 +05:30
Anand Doshi
4096603656
[fix] add index on so_detail in Delivery Note Item
2016-01-07 17:10:09 +05:30
Anand Doshi
ed72a28e41
[minor] patch for billed in DN and PR
2016-01-06 18:53:12 +05:30
Anand Doshi
6b71ef5843
[refactor] changed set_modified, change_modified to update_modified like in the framework
2016-01-06 16:32:06 +05:30
Nabin Hait
1eea26fc5c
[patch] Update billing status in Delivery Note and Purchase Receipt
2016-01-06 15:42:44 +05:30
Nabin Hait
8444febbda
[patch] Repost entries with wrongly selected target warehouse
2015-12-15 15:55:06 +05:30
Rushabh Mehta
13ec41abb2
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 12:59:02 +05:30
Nabin Hait
5d39a9594d
[fix] Reload SO Item in patch
2015-12-09 17:06:09 +05:30
Nabin Hait
4ad0963ee8
[patch][fix] Fixed drop ship status and tax rule patch
2015-12-08 16:51:04 +05:30
Nabin Hait
694373d022
Fixed conflict
2015-12-08 15:30:15 +05:30
Saurabh
70ed6ede5c
[fixes] patch to update delivery status for drop ship item
2015-12-08 14:48:19 +05:30
Nabin Hait
a974ab3dc5
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
2015-12-08 12:56:14 +05:30
Rushabh Mehta
f7911687a0
[minor] fixes to patch
2015-12-03 08:09:42 +05:30
Nabin Hait
621f4cd7c9
[fix] Invoicing against drop-ship Purchase Order
2015-11-30 18:40:28 +05:30
Rushabh Mehta
9785cd35dc
[minor] quote optional in email digest
2015-11-27 14:50:15 +05:30
Rushabh Mehta
b82bdd6f1f
[fix] total amount in journal entry
2015-11-26 09:08:07 +05:30
Anand Doshi
ebae726237
[fix] status update - update qty after int float not null change
2015-11-25 17:55:47 +05:30
Anand Doshi
8c56adf42b
[hotfix] drop ship patch
2015-11-20 00:41:28 +05:30
Nabin Hait
06df19b56a
Reload PO Item before patch
2015-11-19 12:46:37 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Saurabh
20628f5bd8
[patch] mo drop shipment from purchase order to purchase order item
2015-11-18 17:39:25 +05:30
Rushabh Mehta
511421b6a3
[minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405
2015-11-13 11:04:50 +05:30
Anand Doshi
438c4fb279
[patch] reload doctype Leave Allocation
2015-11-07 15:38:29 +05:30
Rushabh Mehta
c14f80838b
[fix] [hot] leave allocation patch
2015-11-06 10:49:16 +05:30
Rushabh Mehta
e54a4004ec
Merge pull request #4258 from anandpdoshi/fixes-3to6
...
[fix] issues encountered migrating from v3/4 to 6
2015-11-02 15:20:25 +05:30
Anand Doshi
aba8fdd18d
[fix] issues encountered migrating from v3/4 to 6
2015-10-31 22:49:42 +05:30
Saurabh
a2c668cb77
[fixes] patch, test cases and validations
2015-10-29 14:27:57 +05:30
Anand Doshi
c794ca53fb
[fix] delete file records created via item.py even if website_image file didn't exist
2015-10-27 16:56:42 +05:30
Anand Doshi
d905204e49
[fix] Update expense account in old purchase invoices if missing
2015-10-22 18:49:08 +05:30
Anand Doshi
d8bc40d7f0
[fix] party gle currency validation
2015-10-22 17:55:22 +05:30
Nabin Hait
70b7f7f036
minor improvement in patch
2015-10-21 17:40:06 +05:30
Nabin Hait
be464696cc
[fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account
2015-10-21 17:40:06 +05:30
Anand Doshi
25ef4ff373
[fix] variant selector display
2015-10-20 18:34:21 +05:30
Anand Doshi
7c0eadb451
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
2015-10-20 17:30:02 +05:30
Anand Doshi
7a869b0dca
[hotfix] print in patch
2015-10-19 17:33:40 +05:30
Rushabh Mehta
2a1ba886f1
[patch-fix]
2015-10-15 16:56:53 +05:30
Rushabh Mehta
fb73151da6
[fixes]
2015-10-14 16:22:01 +05:30
Rushabh Mehta
6e322d0a02
[enhancement] use thumbnails in grid views, patch to make thumbnails
2015-10-14 16:21:24 +05:30
Rushabh Mehta
73e73795f1
[minor] Added 'Invite User' in Contact
2015-10-14 16:20:39 +05:30
Rushabh Mehta
174299124f
[cleanup] [wip] email digest
2015-10-14 15:53:37 +05:30
Rushabh Mehta
86125b2b9f
[fix] sales order status for maintenance
2015-10-13 12:31:05 +05:30
Nabin Hait
b7e46c4ed9
[fix][patch] Delete duplicate bins
2015-10-12 18:28:50 +05:30
Anand Doshi
7866c6e6db
[fix] modified in sales order and purchase order
2015-10-07 17:26:19 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Nabin Hait
7a287a9153
[patch] Fix affected Journal Entries due to reconciliation
2015-10-02 16:00:42 +05:30
Nabin Hait
72d2d682ae
Repost GL Entries for Journal Entries where reference name is missing
2015-09-30 18:50:54 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Anand Doshi
d970b001a4
[fix] Round status update percentages to 2 decimals
2015-09-28 16:52:22 +05:30
Anand Doshi
aea250bc5a
[fix] [patch] fix missing default lead
2015-09-24 16:31:36 +05:30
Anand Doshi
d37d4dfdec
[fix] applicable territory patch and tax rule tests
2015-09-24 15:44:39 +05:30
Anand Doshi
e75d947867
[fix] [patch] convert applicable territory
2015-09-24 15:22:12 +05:30
Anand Doshi
953e97536a
[fix] [patch] tax rule
2015-09-24 15:05:06 +05:30
Anand Doshi
e74d7ca33e
[fix] [patch] tax rule
2015-09-24 15:04:15 +05:30
Anand Doshi
b3f12c3109
[fix] [patch] convert_applicable_territory
2015-09-24 15:01:27 +05:30
Anand Doshi
f66e6aacd4
[fix] [patch] convert_applicable_territory
2015-09-24 14:59:26 +05:30
Anand Doshi
c020e42d20
[fix] [patch] convert applicable territory
2015-09-24 13:08:35 +05:30
Rushabh Mehta
72fbf902d7
[cleanup] added single price list for shopping cart, removed Applicable Territory
2015-09-23 12:50:34 +05:30
Anand Doshi
0a1d037f01
Merge pull request #3974 from rmehta/dms
...
[enhancement] document management system
2015-09-22 14:51:01 +05:30
Anand Doshi
0332f83bc2
[fix] customer naming series validation and patch to fix missing default taxes and lead
2015-09-17 19:01:48 +05:30
Anand Doshi
e9b14e497b
[fix] remove duplicate newsletter subscribers
2015-09-17 17:46:40 +05:30
Anand Doshi
cba5a684cb
[hotfix] multicurrency patch
2015-09-17 17:36:05 +05:30
Anand Doshi
340709b2da
[hotfix] multicurrency patch
2015-09-17 17:28:39 +05:30
Nabin Hait
9ff52cd57e
[fix] Multi currency patch
2015-09-17 17:07:26 +05:30
Rushabh Mehta
e3401182c8
Merge pull request #4012 from saurabh6790/cart
...
Taxation for Shopping Cart based on Tax Rule template
2015-09-17 16:26:35 +05:30
Anand Doshi
c19afa140d
[fix] reload time log in update projects patch
2015-09-16 12:44:22 +05:30
Neil Trini Lasrado
1a2d121073
Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier
2015-09-15 15:41:00 +05:30
Anand Doshi
b74265c842
[minor] [patch] reload activity cost in default_activity_rate
2015-09-15 11:27:19 +05:30
Nabin Hait
f76d63b92a
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
...
[fix][patch] delete item variant attributes if no variants exists against that item
2015-09-10 19:26:02 +05:30
Anand Doshi
793b87948c
[fix] [patch] item template attributes
2015-09-10 18:10:15 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd
Multi-currency: Exchange Rate in Journal Entry
2015-09-09 18:43:12 +05:30
Anand Doshi
b1454cdf9f
[fix] fix planned qty
2015-09-09 18:00:09 +05:30
Nabin Hait
f0b3014a23
Planned Qty logic fixed and reposted for existing
2015-09-09 11:04:10 +05:30
Nabin Hait
6c3ff3e2ed
Fixed conflict
2015-09-08 18:09:03 +05:30
Nabin Hait
83a358afc1
Fix invoice outstanding where party missing
...
Conflicts:
erpnext/accounts/doctype/gl_entry/gl_entry.py
erpnext/patches.txt
2015-09-08 16:37:26 +05:30
Anand Doshi
43888546f6
Merge pull request #3968 from rmehta/task-not-mandatory
...
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-08 15:47:11 +05:30
Nabin Hait
3607737b5e
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
2015-09-07 10:41:01 +05:30
Anand Doshi
28f8664b93
[fix] [patch] reload item attribute + value
2015-09-04 16:41:27 +05:30
Rushabh Mehta
4223d7c044
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-04 16:18:17 +05:30
Nabin Hait
34fe81f7eb
Patch fixed
2015-09-03 19:18:00 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Rushabh Mehta
deb38f7a68
[enhancement] document management system
2015-09-02 18:34:24 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
c68f68d6cc
[fix] Patch fixed for account_currency field rename
2015-08-28 19:26:28 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
f370b0c6a4
[fix] print hide additional discount, reload doctypes in sales return patch
2015-08-27 16:03:29 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
54fe26dcfb
[patch] Multi currency
2015-08-27 12:55:24 +05:30
Rushabh Mehta
cd2d8a0410
[merge] re-applied changes to sales invoice & delivery note
2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929
Merge branch 'layout-cleanup' into develop
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/stock/doctype/delivery_note/delivery_note.json
2015-08-27 11:01:39 +05:30
Rushabh Mehta
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Anand Doshi
cb2f9a863d
[hotfix] reload Sales and Purchase Order Item
2015-08-26 17:42:40 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9
Update order reference in return entries and repost reserved / ordered qty
2015-08-25 14:11:13 +05:30
Nabin Hait
b69eb84936
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 16:55:10 +05:30
Nabin Hait
69c1401764
Multi currency patch initialized
2015-08-21 14:31:47 +05:30
Anand Doshi
8554cbf001
[minor] fixed patch item template attributes
2015-08-20 17:43:35 +05:30
Nabin Hait
24998a6ca7
[fix][patch] Delete Bin for non-stock item
2015-08-20 15:21:42 +05:30
Nabin Hait
712fccd876
[fix][patch] Repost reserved qty for stock item
2015-08-20 14:59:44 +05:30
Anand Doshi
807c6af571
[minor] fix item template attributes
2015-08-20 11:42:05 +05:30
Nabin Hait
3922823bd6
[fix] Test case fixed for purchase cost against project
2015-08-19 14:23:13 +05:30
Nabin Hait
6ce72c5b07
[fix] Update project cost for draft project only
2015-08-19 14:15:28 +05:30
Nabin Hait
fa5fcf5405
[fix] Purchase cost against project
2015-08-19 11:56:23 +05:30
Nabin Hait
1826791891
[fix][patch] Reserved Qty logic fixed and reposted for existing items
2015-08-19 11:00:00 +05:30
Anand Doshi
2f01f96ae3
[fix] [patch] item template attributes
2015-08-18 17:52:50 +05:30
Anand Doshi
afbe39a559
[fix] patch and rename Variant Attribute to Item Variant Attribute
2015-08-18 17:30:44 +05:30
Anand Doshi
09ba897297
[fix] [patch] Item Template Attributes - migration from v4 and v5
2015-08-17 19:21:29 +05:30
Nabin Hait
3278ea177d
[fix] Additional Costs patch fixed for version 4 to 5 migration
2015-08-17 17:58:52 +05:30
Anand Doshi
5dc7ff1355
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Anand Doshi
bfbf768daa
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30