Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,750 Commits 3 Branches 0 Tags 1 GiB
fa220f93be
Commit Graph

16750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
c538a55a5a bumped to version 7.1.4 2016-11-01 15:35:53 +06:00
Nabin Hait
aa7a329633 Merge pull request #6783 from rohitwaghchaure/v7_1_issue 
Hotfix issues
 2016-11-01 14:48:06 +05:30
Kanchan Chauhan
283b8c98f8 [Fix] Customer Addresses and Contacts report fixed for CRM module 2016-11-01 14:38:06 +05:30
Rohit Waghchaure
53bb687009 hotfix issues 2016-11-01 13:21:43 +05:30
Nabin Hait
22161566ed Update index.md 2016-11-01 12:36:03 +05:30
Nabin Hait
b8617cfdf9 Merge pull request #6777 from nabinhait/hotfix 
[fix] Report GLE for Purchase Invoice with Update Stock option
 2016-11-01 12:31:51 +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
eb2a98faca Merge pull request #6776 from shreyasp/coa-docs 
[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report
 2016-11-01 11:07:39 +05:30
shreyas
9cffdba940 [Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report 2016-10-31 23:25:10 +05:30
bcornwellmott
3af67fb2c3 Fix syntax 2016-10-31 08:53:37 -07:00
bcornwellmott
8d083f0d10 [fix] Change communication to Linked 
Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue.

https://discuss.erpnext.com/t/open-communications-for-rfq/17184
 2016-10-31 06:54:01 -07:00
Kanchan Chauhan
6b162386ca Different name on Check 2016-10-31 17:36:43 +05:30
Nabin Hait
0acfd518a8 Merge pull request #6770 from neilLasrado/develop 
Fixes for demo
 2016-10-31 17:29:01 +05:30
Nabin Hait
07fa5f1377 Merge pull request #6769 from frappe/nabinhait-patch-4 
show relevant warehouses in item dashboard
 2016-10-31 17:24:25 +05:30
Neil Trini Lasrado
ebe0b6557c Fixes for demo 2016-10-31 17:13:30 +05:30
Nabin Hait
b9f708663c Update item.py 2016-10-31 16:52:17 +05:30
Nabin Hait
551360ae30 Fixed merge conflict 2016-10-31 16:38:09 +05:30
Nabin Hait
6ece870b6e Merge branch 'hotfix' 2016-10-31 16:37:29 +05:30
Nabin Hait
60aa3898c7 bumped to version 7.1.3 2016-10-31 17:07:29 +06:00
Nabin Hait
fd3aefd73d Merge pull request #6763 from rohitwaghchaure/documentation 
[Fix] Documentation
 2016-10-31 16:35:54 +05:30
Nabin Hait
1764da7ba8 Merge pull request #6766 from nabinhait/hotfix 
repost gle for Purchase Invoice with update stock
 2016-10-31 16:34:35 +05:30
Nabin Hait
c851d24b2c Merge pull request #6765 from KanchanChauhan/broken-creation-document-link 
[Fix] Serial No report fixed for Creation No link
 2016-10-31 16:26:41 +05:30
Nabin Hait
f5f3ef1bae repost gle for Purchase Invoice with update stock 2016-10-31 16:17:10 +05:30
Kanchan Chauhan
9100322462 [Fix] Serial No report fixed for Creation No link 2016-10-31 16:01:09 +05:30
Rohit Waghchaure
4fe4f267f4 [Fix] Documentation 2016-10-31 15:40:59 +05:30
Nabin Hait
d9b994de91 Merge branch 'master' into develop 2016-10-31 15:04:31 +05:30
Nabin Hait
1e45ec9237 Merge branch 'hotfix' 2016-10-31 15:04:31 +05:30
Nabin Hait
9a8be357e6 bumped to version 7.1.2 2016-10-31 15:34:31 +06:00
Nabin Hait
d08ced14ca Merge pull request #6751 from neilLasrado/develop 
Fixes to demo
 2016-10-31 13:15:36 +05:30
Nabin Hait
eb1a55bbba Update purchase_receipt.py 2016-10-29 14:49:33 +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
Nabin Hait
44281b7a01 Merge pull request #6719 from frappe/bcornwellmott-patch-1 
Fix calendar view for Timesheet
 2016-10-29 14:41:42 +05:30
Nabin Hait
7d3012d0b8 Merge pull request #6722 from mbauskar/develop 
[minor] link formatter fixes for Item and Employee
 2016-10-29 14:41:00 +05:30
Nabin Hait
358492fbde Merge pull request #6745 from frappe/nabinhait-patch-2 
Update ae_uae_chart_template_standard.json
 2016-10-29 14:39:15 +05:30
Faris Ansari
8dbcbcf0f4 [documentation] Update Sales Invoice #6507 (#6748) 
* [documentation] Update Sales Invoice

* add screenshot

* delete screenshot

* add correct screenshot
 2016-10-29 14:38:03 +05:30
Nabin Hait
e585683db3 Merge pull request #6750 from rohitwaghchaure/country_wise_tax_issue 
[Fix] country wise tax, country name issue
 2016-10-29 14:37:32 +05:30
Neil Trini Lasrado
71e3746a05 Fixes to demo 2016-10-28 18:59:33 +05:30
Rohit Waghchaure
7488cf1ce1 [Fix] country wise tax, country name issue 2016-10-28 18:01:43 +05:30
Neil Trini Lasrado
29cae17e87 Fix user for demo 2016-10-28 16:39:45 +05:30
Nabin Hait
bb5e333c1a Update ae_uae_chart_template_standard.json 2016-10-28 15:20:31 +05:30
Kanchan Chauhan
4c22825f01 Default warehouse in Item master 2016-10-27 23:56:04 +05:30
Nabin Hait
a330d330c8 Merge branch 'master' into develop 2016-10-27 19:14:55 +05:30
Nabin Hait
6f0897c258 Merge branch 'hotfix' 2016-10-27 19:14:54 +05:30
Nabin Hait
9dcb778f17 bumped to version 7.1.1 2016-10-27 19:44:54 +06:00
Nabin Hait
5ad56ef446 Merge pull request #6727 from saurabh6790/hotfix 
[enhance] introduce ignore_fields param for _tree and get_query
 2016-10-27 19:06:32 +05:30
Nabin Hait
8042ba3be3 Merge pull request #6728 from neilLasrado/develop 
Added naming series to Course Schedule
 2016-10-27 15:37:59 +05:30
Neil Trini Lasrado
5f041e9665 Added naming series to Course Schedule 2016-10-27 15:37:03 +05:30
Saurabh
468e41f24f [enhance] introduce ignore_fields param for _tree and get_query 2016-10-27 15:23:19 +05:30
Nabin Hait
622c05cc60 Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue 
[Fix] No permission to read report Bank Clearance Summary for account user
 2016-10-27 13:48:19 +05:30