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 |
|