Neil Trini Lasrado
|
38bd62d82d
|
Merge branch 'develop' into assessment
|
2017-01-16 12:23:51 +05:30 |
|
Nabin Hait
|
e43a94de4b
|
Merge branch 'hotfix' into draft_status_issue_after_amend
|
2017-01-13 13:14:32 +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
|
5c87455918
|
Patch for assessment module redesign
|
2017-01-09 18:26:03 +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 |
|
Rushabh Mehta
|
2a86c32267
|
[minor] [patch] remove icon if present, fixes #6949
|
2016-12-20 12:20:39 +05:30 |
|
Nabin Hait
|
201af80706
|
Fixed merge conflict
|
2016-12-13 14:30:32 +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
|
288a18e0cc
|
Fixes and patch for Currency Exchange based on date
|
2016-12-08 15:36:23 +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
|
672ffc0ff4
|
Update patches.txt
|
2016-11-25 11:15:20 +05:30 |
|
Rohit Waghchaure
|
b1b328865e
|
[Enhancement] Currency added in the BOM
|
2016-11-22 12:52:20 +05:30 |
|
Nabin Hait
|
d855167b9b
|
Fixed merge conflict
|
2016-11-21 19:13:22 +05:30 |
|
Rohit Waghchaure
|
4810d1fa2d
|
patch for rename autoname field
|
2016-11-21 16:52:50 +05:30 |
|
Nabin Hait
|
8af429da1f
|
Cleanup and fixes in quality inspection feature
|
2016-11-16 17:22:38 +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 |
|
Nabin Hait
|
ceca1b97c3
|
Fixed merge conflict
|
2016-11-09 14:58:36 +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 |
|
Rohit Waghchaure
|
0ecad33642
|
cleanup and fixes
|
2016-11-05 08:09:21 +05:30 |
|
Nabin Hait
|
f5d8dd3b18
|
Fixed merge conflict
|
2016-11-04 16:54:53 +05:30 |
|
Nabin Hait
|
e593f170a3
|
[fix] Patch order changed
|
2016-11-04 11:43:58 +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 |
|
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 |
|