Nabin Hait
|
6d04afc19d
|
fixed merge conflict
|
2016-11-16 12:56:31 +05:30 |
|
Nabin Hait
|
67bceef1cb
|
Merge branch 'hotfix'
|
2016-11-16 12:55:59 +05:30 |
|
Nabin Hait
|
38bfcaa203
|
bumped to version 7.1.13
|
2016-11-16 13:25:59 +06:00 |
|
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
|
d65d67e0a7
|
Merge branch 'hotfix'
|
2016-11-16 11:26:42 +05:30 |
|
Rushabh Mehta
|
a78bac61cc
|
bumped to version 7.1.12
|
2016-11-16 11:56:42 +06:00 |
|
rohitwaghchaure
|
48cb3d89b6
|
[Fix] Opening balance calculation issue for balance sheet (#6945)
|
2016-11-16 11:18:49 +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 |
|
Shreyas Patil
|
99a3593a0d
|
[Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948)
|
2016-11-16 11:16:44 +05:30 |
|
rohitwaghchaure
|
7be942db54
|
[Fix] Status updater for sales order in purchase order (#6944)
|
2016-11-16 11:14:32 +05:30 |
|
Rushabh Mehta
|
24f658d633
|
[fix] [minor] accounts receivable not translated (#6943)
|
2016-11-16 11:13:46 +05:30 |
|
Rushabh Mehta
|
d51e1587d5
|
[fix] contact us page should create a opportunity by default (#6939)
|
2016-11-16 11:13:31 +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
|
952b1cb9a7
|
Merge pull request #6933 from rohitwaghchaure/remove_no_copy
disable no copy for po number, po date on sales order
|
2016-11-14 17:47:57 +05:30 |
|
Rohit Waghchaure
|
6f27f580e1
|
disable no copy for po number, po date on sales order
|
2016-11-14 16:08:18 +05:30 |
|
Rushabh Mehta
|
440650d4a2
|
[fix] view shopping cart dropdown (#6928)
|
2016-11-14 13:13:53 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
6261745366
|
Merge branch 'hotfix'
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
d209f21e76
|
bumped to version 7.1.11
|
2016-11-14 13:12:25 +06:00 |
|
Nabin Hait
|
da4689461a
|
Merge pull request #6926 from nabinhait/hotfix
Multiple fixes
|
2016-11-14 12:37:11 +05:30 |
|
Nabin Hait
|
a5a733630f
|
[fix] Opportunity loading issue
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
0075c7e659
|
Purchase Order and Receipt links in Purchase Invoice dashboard
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
7017dc029a
|
Editable grid columns for payment entry
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
f98835036b
|
Merge pull request #6900 from rohitwaghchaure/account_receivable_summary_report_issue
[Report] Company not found in the filter for making auto email report
|
2016-11-14 12:00:48 +05:30 |
|
Nabin Hait
|
47c8d5fd56
|
Merge pull request #6924 from nabinhait/hotfix
Fixed multiple minor issues
|
2016-11-14 11:59:46 +05:30 |
|
Nabin Hait
|
6209f2f75b
|
Merge pull request #6925 from rmehta/setup-wizard-fix
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
|
2016-11-14 11:59:26 +05:30 |
|
Rushabh Mehta
|
463808ef9e
|
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
|
2016-11-14 11:21:11 +05:30 |
|
Nabin Hait
|
256a3fef95
|
Fixed multiple minor issues
|
2016-11-14 11:10:50 +05:30 |
|
Rohit Waghchaure
|
387c2846aa
|
[Report] Company not found in the filter for making auto email report
|
2016-11-10 19:13:20 +05:30 |
|
Nabin Hait
|
598a0c918d
|
[fix] fixed student dashboard issue (#6897)
|
2016-11-10 17:25:37 +05:30 |
|
Nabin Hait
|
176577b549
|
Merge branch 'hotfix'
|
2016-11-10 11:25:33 +05:30 |
|
Nabin Hait
|
fa220f93be
|
Merge branch 'master' into develop
|
2016-11-10 11:25:33 +05:30 |
|
Nabin Hait
|
27c1f85836
|
bumped to version 7.1.10
|
2016-11-10 11:55:33 +06:00 |
|
Nabin Hait
|
84ecaac27d
|
Update set_base_amount_in_invoice_payment_table.py
|
2016-11-10 11:24:22 +05:30 |
|
Nabin Hait
|
4430f2f81c
|
Merge pull request #6878 from saurabh6790/reporting_stock_after_rename_warehouse
[fix] repost qty only for bin items
|
2016-11-09 16:55:58 +05:30 |
|
Saurabh
|
7fbc00c9d6
|
[fix] repost qty only for bin items
|
2016-11-09 16:10:42 +05:30 |
|
Nabin Hait
|
ceca1b97c3
|
Fixed merge conflict
|
2016-11-09 14:58:36 +05:30 |
|
Nabin Hait
|
0f2e3a4e95
|
Merge branch 'hotfix'
|
2016-11-09 14:55:29 +05:30 |
|
Nabin Hait
|
549de70fa2
|
bumped to version 7.1.9
|
2016-11-09 15:25:29 +06:00 |
|
Nabin Hait
|
9e83b70ea8
|
Merge pull request #6860 from rohitwaghchaure/status_for_sales_invoice
Added status field in sales invoice and purchase invoice
|
2016-11-09 14:53:03 +05:30 |
|
Rohit Waghchaure
|
2285f90b64
|
added debit and credit note status
|
2016-11-09 14:47:24 +05:30 |
|
Nabin Hait
|
bac447137a
|
Merge pull request #6833 from KanchanChauhan/jv-documentation
Credit Note, Debit Note, Excise Entry info added
|
2016-11-09 11:42:27 +05:30 |
|
Nabin Hait
|
5ccead5df0
|
Merge pull request #6850 from nabinhait/clear_jv_table
Clear rows from Journal Entry if no debit/credit
|
2016-11-09 11:40:42 +05:30 |
|
Nabin Hait
|
d4e59aa54f
|
Update journal_entry.py
|
2016-11-09 11:38:39 +05:30 |
|
Nabin Hait
|
a3daf58423
|
Merge pull request #6873 from saurabh6790/integration_broker_fix
[fix] added hook call to create payment gateway account record
|
2016-11-09 11:32:35 +05:30 |
|
Nabin Hait
|
82d1b23dcb
|
Merge pull request #6861 from rmehta/item-dashboard-enhancements
[minor] enhancements to item dashboard, filter by item group and show item name fixes #6459
|
2016-11-09 11:21:22 +05:30 |
|
Nabin Hait
|
a0a8cc58ae
|
Merge pull request #6865 from frappe/typo-fix
[fix] minor typo
|
2016-11-09 11:20:34 +05:30 |
|
Saurabh
|
94c666ae46
|
[fix] added hook call to create payment gateway account record
|
2016-11-08 20:35:50 +05:30 |
|