Commit Graph

17324 Commits

Author SHA1 Message Date
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
shreyas
2cb294c8b4 [Docs] Updated docs for supplier quotation and purchase order 2016-11-10 18:14:33 +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
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
cefcf165c4 Merge branch 'hotfix' 2016-11-08 15:22:54 +05:30
Nabin Hait
436d82e60b bumped to version 7.1.8 2016-11-08 15:52:54 +06:00
Valmik
38cc16a806 [fix] minor typo 2016-11-08 14:11:12 +05:30
Nabin Hait
ed05a9928b Merge pull request #6864 from frappe/nabinhait-patch-5
Show transaction id in validation message
2016-11-08 13:23:36 +05:30
Nabin Hait
be06cde5f5 Update gl_entry.py 2016-11-08 13:13:57 +05:30
Rushabh Mehta
057db06216 [minor] enhancements to item dashboard, filter by item group and show item name fixes #6459 2016-11-08 12:40:10 +05:30
Nabin Hait
090931e667 Merge pull request #6857 from strixaluco/develop
[typo] desription → description
2016-11-08 12:06:20 +05:30
Nabin Hait
cdc895734f Merge pull request #6819 from rohitwaghchaure/hotfix_issues
cleanup and fixes
2016-11-08 12:05:47 +05:30
Nabin Hait
d2cf4eb1d2 Merge pull request #6851 from rohitwaghchaure/pricing_rule_discount_issue
[POS] Pricing rule discount issue
2016-11-08 12:02:51 +05:30
strixaluco
c8bfc87b58 [typo] desription → description in zh-tw.csv 2016-11-08 10:57:45 +08:00
strixaluco
06e9de82a6 [typo] desription → description in es-PE.csv 2016-11-08 10:57:16 +08:00
strixaluco
2ef9232707 [typo] desription → description in bom.json 2016-11-08 10:56:36 +08:00
Kanchan Chauhan
b5574d3571 Credit Note, Debit Note, Excise Entry info added 2016-11-07 23:10:20 +05:30
Rohit Waghchaure
619c40b04a [POS] Pricing rule discount issue 2016-11-07 19:41:10 +05:30
KanchanChauhan
6d5fcdec5a Item Inspection before Delivery (#6823) 2016-11-07 17:49:37 +05:30
Rushabh Mehta
13fc52d713 [minor] added default standard filters (#6854) 2016-11-07 17:19:19 +05:30
pratu16x7
84228402e6 Update erpnext manual link (#6853)
* Update erpnext manual link

* Update README.md

* Update conf.js
2016-11-07 17:18:15 +05:30
robert schouten
8672f29c6f [minor] add rate to stock entry detail grid (#6843) 2016-11-07 17:17:12 +05:30