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 |
|
Kanchan Chauhan
|
4c22825f01
|
Default warehouse in Item master
|
2016-10-27 23:56:04 +05:30 |
|
Rohit Waghchaure
|
69be01aa1b
|
[Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer
|
2016-10-20 16:38:30 +05:30 |
|
Rohit Waghchaure
|
18fa0d8691
|
patch to set default value as 1
|
2016-10-20 16:16:28 +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 |
|
Kanchan Chauhan
|
dc86964e91
|
Patch fixed for Employee
|
2016-10-18 11:29:41 +05:30 |
|
Nabin Hait
|
b3b1219109
|
Fixed merge conflict
|
2016-10-17 17:42:53 +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
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +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
|
16f3f378f6
|
Update patches.txt
|
2016-10-07 12:54:27 +05:30 |
|
RobertSchouten
|
e0a636c081
|
[fix] update timestamps and relink communication for timesheet
|
2016-10-07 11:03:04 +08:00 |
|
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 |
|
Nabin Hait
|
d0a25f72c7
|
Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue
[Fix] Timesheet detail records not deleted with company transactions deletion
|
2016-09-29 13:55:38 +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
|
17adb970f1
|
[Fix] Timesheet detail records not deleted with company transactions deletion
|
2016-09-29 01:07:28 +05:30 |
|
Rohit Waghchaure
|
0a6529a643
|
Remove time log, time log batch from Doc Field.
|
2016-09-28 13:03:42 +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
|
3720045eb9
|
Update patches.txt
|
2016-09-23 16:31:43 +05:30 |
|
Nabin Hait
|
6b4eb7f77f
|
Fixed version conflict
|
2016-09-23 12:16:31 +05:30 |
|
Rohit Waghchaure
|
b2382c0b8e
|
[fix] Supplier status stuck at Open forever
|
2016-09-22 18:45:24 +05:30 |
|
Nabin Hait
|
e5c7d4b987
|
Fixed version conflict
|
2016-09-22 11:33:51 +05:30 |
|
Nabin Hait
|
7108991039
|
Patch order changed
|
2016-09-21 16:34:44 +05:30 |
|
robert schouten
|
d7721a605d
|
preferred email for payroll
|
2016-09-21 11:36:01 +08:00 |
|
Nabin Hait
|
9f4ca1fb9e
|
set posting date in salalry slip
|
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
|
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
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
Rohit Waghchaure
|
03e5e68a7a
|
[Fix] Employee name is missing in timesheet
|
2016-09-12 16:14:06 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
b44efef094
|
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:21:38 +05:30 |
|
Neil Trini Lasrado
|
49da25dd57
|
Added patch
|
2016-09-06 15:45:17 +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
|
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 |
|
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 |
|
Rohit Waghchaure
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rushabh Mehta
|
69349f2672
|
[fix] [patch] column conversion before item reload
|
2016-08-18 17:06:55 +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
|
de08639d49
|
[minor] fixes to patches while moving from v5
|
2016-08-16 10:01:56 +05:30 |
|
Nabin Hait
|
f44b5152d2
|
Portal settings for schools
|
2016-08-09 17:08:13 +05:30 |
|
Nabin Hait
|
ee018b5ae1
|
[fix]Patch order changed. Fixed #6026
|
2016-08-09 11:27:28 +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 |
|
Rohit Waghchaure
|
08aadb853c
|
PPT looks at default MR type in Item to set MR type.
|
2016-08-02 16:59:03 +05:30 |
|
Nabin Hait
|
3c364dd5b8
|
[patch] Update refdoc in Landed Cost Voucher
|
2016-08-01 15:53:36 +05:30 |
|
Neil Trini Lasrado
|
74dbd168c2
|
[new Feature] Added guardian master
|
2016-08-01 15:08:04 +05:30 |
|
Nabin Hait
|
66126ffc7a
|
Merge pull request #5938 from nabinhait/salary_renaming
Delete old salary earning and deduction doctypes
|
2016-08-01 13:06:52 +05:30 |
|
Nabin Hait
|
bc691dccba
|
Changed the order of the patch
|
2016-08-01 12:36:28 +05:30 |
|
Nabin Hait
|
feed313a66
|
Delete old salary earning and deduction doctypes
|
2016-08-01 11:54:19 +05:30 |
|
Nabin Hait
|
e72ff9377a
|
Added converted status in Opportunity
|
2016-07-28 15:59:20 +05:30 |
|
Neil Trini Lasrado
|
98151ce5b2
|
[Patch] Change status in Opportunity to Quotation where status is converted
|
2016-07-27 15:58:16 +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 |
|
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
|
ead3ccfd52
|
[fix] more routes patch up
|
2016-07-24 22:28:50 +05:30 |
|
Rushabh Mehta
|
20038ad2c9
|
[fixes] setup wizard and domainify for schools;
|
2016-07-21 16:01:59 +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 |
|
Nabin Hait
|
4fddff1606
|
Merge pull request #5767 from nabinhait/fix101
Payment Improvements
|
2016-07-16 11:55:12 +05:30 |
|
Nabin Hait
|
2842a86225
|
Merge pull request #5775 from revant/patch-1
Issue #5774
|
2016-07-16 11:28:15 +05:30 |
|
Revant Nandgaonkar
|
88e16a7f82
|
removed force=True
|
2016-07-16 11:00:37 +05:30 |
|
Nabin Hait
|
6831b9422b
|
payment entry improvements and deletion of payment tool
|
2016-07-16 11:00:29 +05:30 |
|
Revant Nandgaonkar
|
cc08682879
|
Issue #5774
|
2016-07-15 23:41:22 +05:30 |
|
Kanchan Chauhan
|
9846b945d9
|
Patch to delete previous report
|
2016-07-15 14:06:20 +05:30 |
|
Kanchan Chauhan
|
7ff0c4eef4
|
Employee Attendance report renamed to Employees working on a holiday
|
2016-07-15 13:42:36 +05:30 |
|
Rohit Waghchaure
|
3bc6a958c7
|
[Fix] Timesheet overlap issue
|
2016-07-14 18:27:49 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Nabin Hait
|
54bd79bd93
|
Merge pull request #5690 from nabinhait/fix100
Deleted report Customers Not Buying Since Long Time
|
2016-07-11 12:52:35 +05:30 |
|
Nabin Hait
|
bbc394fd72
|
Changed patch order to fix old patches
|
2016-07-11 12:40:18 +05:30 |
|
Nabin Hait
|
f176cc03df
|
Deleted report Customers Not Buying Since Long Time
|
2016-07-08 09:03:13 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Rohit Waghchaure
|
a71d9d33af
|
Rename prevdoc field in purchase order and purchase receipt doctype
|
2016-07-06 12:13:29 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Rushabh Mehta
|
c1d2247f2c
|
Merge pull request #5620 from nabinhait/payment_entry
Payment Entry
|
2016-07-04 13:01:16 +05:30 |
|
Nabin Hait
|
1991c7b17d
|
Payment Reconciliation changes for Payment Entry
|
2016-07-04 11:42:24 +05:30 |
|
Saurabh
|
f5ab5f3c0c
|
[minor][fix] reload warehouse before executing patches
|
2016-07-04 11:38:58 +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 |
|
Kanchan Chauhan
|
fb3eb13ca4
|
New Maintenance Module
|
2016-06-29 15:51:02 +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 |
|
Anand Doshi
|
771ab0c8c3
|
[fix] [patch] re-route
|
2016-06-27 12:04:48 +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
|
dfbcdeb8a0
|
[enhancement] warehouse tree structure
|
2016-06-25 11:06:12 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +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
|
a55fb6426c
|
[patch] mins_to_first_response in opporutnity and issue
|
2016-06-14 15:54:54 +05:30 |
|
Rohit Waghchaure
|
9fe40d557f
|
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
|
2016-06-14 01:11:09 +05:30 |
|
Rushabh Mehta
|
d56306add0
|
[minor] [fix] quotation cancelled status issue, fixes #5221
|
2016-06-09 15:56:48 +05:30 |
|
Nabin Hait
|
591a5aba56
|
Added Project in GL Entry and General Ledger report
|
2016-05-26 17:51:20 +05:30 |
|
Nabin Hait
|
b46d021f2a
|
Charts on reports / activity page, deprecated financial analytics report
|
2016-05-26 15:26:01 +05:30 |
|
Nabin Hait
|
ca90963d5b
|
Redesigned budgets
|
2016-05-23 13:04:26 +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 |
|
Anand Doshi
|
49e470035d
|
[fix] removed rename_item_field patch
|
2016-04-29 12:50:07 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +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 |
|
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 |
|
Nabin Hait
|
2646f84a30
|
[patch] Fix delivery and billing status of recurring orders
|
2016-03-21 15:22:31 +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 |
|
Neil Trini Lasrado
|
6e343e23d9
|
Renamed project_name to project
|
2016-03-15 17:50:53 +05:30 |
|
Anand Doshi
|
4284fcf2a6
|
[fix] additional fixes for removal of Fiscal Year form Holiday List
|
2016-03-11 17:16:30 +05:30 |
|
Anand Doshi
|
6d59a41b27
|
[fix] delete Web Form contact
|
2016-03-10 14:31:04 +05:30 |
|
shreyas
|
6f8dfa4c8d
|
[Minor] Fix print settings for custom print format
|
2016-03-07 18:22:40 +05:30 |
|
Rushabh Mehta
|
5a700820e7
|
[fix] [minor] autoload chart of accounts
|
2016-03-07 11:57:54 +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 |
|
Anand Doshi
|
7b52dc9f32
|
[hotfix] added back comment_feed_communication patch
|
2016-02-26 20:51:33 +05:30 |
|
Nabin Hait
|
737849a0f5
|
[patch] Update stopped status to close
|
2016-02-25 15:16:02 +05:30 |
|
Saurabh
|
dca6302e15
|
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
|
2016-02-24 15:07:24 +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 |
|
Nabin Hait
|
ee8f88d641
|
[patch] Set party account currency in existing orders
|
2016-01-27 16:01:31 +05:30 |
|
Anand Doshi
|
eca2e42ecb
|
[fix] patch title field of Pricing Rule
|
2016-01-27 12:36:36 +05:30 |
|
Nabin Hait
|
a613ea8abf
|
[patch] Create manufacturer records
|
2016-01-20 18:32:37 +05:30 |
|
Nabin Hait
|
fb0b24af78
|
Rounding based on smallest circulating currency fraction value
|
2016-01-20 17:07:35 +05:30 |
|
Nabin Hait
|
c040075bd4
|
[patch] Update billing status in Delivery Note and Purchase Receipt
|
2016-01-06 15:42:44 +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
|
4ad0963ee8
|
[patch][fix] Fixed drop ship status and tax rule patch
|
2015-12-08 16:51:04 +05:30 |
|