Commit Graph

17052 Commits

Author SHA1 Message Date
Nabin Hait
b6c7420a34 Merge pull request #7068 from frappe/MaxMorais-patch-1
Bug due Translation support in Support Analytics
2016-11-28 12:41:52 +05:30
Nabin Hait
8020b5ceb7 Merge pull request #7063 from umairsy/conf
[Fixed] Documentation #6892
2016-11-28 12:40:55 +05:30
Nabin Hait
fe10780878 Merge pull request #7076 from yashodhank/manual-fixes
[Docs] Fixed type and renamed file
2016-11-28 12:39:57 +05:30
Nabin Hait
1d656f40ad Merge pull request #7074 from KanchanChauhan/added-account-type
Added account types to Add Child option of COA
2016-11-28 12:39:40 +05:30
Nabin Hait
96be3dd4f4 Merge pull request #7082 from rohitwaghchaure/pos_qty_issues
[Fix] Wrong actual qty showing in POS
2016-11-28 12:39:09 +05:30
Nabin Hait
1880fc46d3 Merge pull request #7084 from nabinhait/hotfix
Multiple minor fixes
2016-11-28 12:38:48 +05:30
Nabin Hait
a78c463e97 Multiple minor fixes 2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c [Fix] Wrong actual qty showing in POS 2016-11-27 12:04:12 +05:30
Yashodhan K
7b090312d5 [Docs] Fixed type and renamed file
Fixed typo and renamed file to correct url link.
2016-11-26 20:08:02 +05:30
Kanchan Chauhan
50593317d9 Added account types to Add Child option of COA 2016-11-26 18:49:32 +05:30
Nabin Hait
d0839799c1 Update workstation.py 2016-11-26 09:54:00 +05:30
Rohit Waghchaure
bca0d73e1c [Fix] Cost center group not showing data in the P&L report 2016-11-25 14:54:34 +05:30
Nabin Hait
14823d0d0f Merge pull request #7066 from rohitwaghchaure/pos_barcode_search_issue
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:20:55 +05:30
Rohit Waghchaure
9a36083095 [fix] Barcode and special character issue in the search box of the POS 2016-11-25 11:17:48 +05:30
Nabin Hait
2ada1600ed Merge pull request #7069 from frappe/nabinhait-patch-6
Update patches.txt
2016-11-25 11:15:46 +05:30
Nabin Hait
672ffc0ff4 Update patches.txt 2016-11-25 11:15:20 +05:30
Maxwell Morais
2f948530cb Bug due Translation support in Support Analytics
I think no one that don't speak english use this!
But today talking about this report, I discovered that it dont work!

For my surprise, it don't work have 2 years, if you aren't a english speaker!
2016-11-24 20:36:40 -06:00
Umair Sayyed
829e00c2e6 [Fixed] Documentation #6892 2016-11-24 17:41:29 +05:30
Nabin Hait
3247db4827 Merge pull request #7050 from nabinhait/coa_based_on_existing_company
Create Chart of Accounts based on existing company
2016-11-24 13:28:11 +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
Nabin Hait
1e3d14fda7 Merge pull request #7051 from rohitwaghchaure/v7_timesheet_cleanup
cleanup timesheet and fix sales invoice total timesheet billing amount
2016-11-24 13:06:04 +05:30
Saurabh
8cd1918a3c [documentaion] Documentaion for setting up Integration Service 2016-11-23 19:09:43 +05:30
Rohit Waghchaure
8c4e45ab3d cleanup timesheet 2016-11-23 17:54:47 +05:30
Nabin Hait
e0089184e6 Create Chart of Accounts based on existing company 2016-11-23 17:34:16 +05:30
bhupen
c097a4fe68 Changes in company doctype for chart of accounts 2016-11-23 17:34:16 +05:30
Nabin Hait
6fc850d071 Merge branch 'hotfix' 2016-11-23 16:00:22 +05:30
Nabin Hait
f89f17cdde Merge branch 'master' into develop 2016-11-23 16:00:22 +05:30
Nabin Hait
580534a22a bumped to version 7.1.19 2016-11-23 16:30:22 +06:00
Nabin Hait
297d74a997 Unlink payment entries on cancellation of invoice 2016-11-23 15:59:00 +05:30
Nabin Hait
d194cce35c fixed merge conflict 2016-11-23 14:55:23 +05:30
Nabin Hait
b8a7926464 Merge branch 'hotfix' 2016-11-23 14:53:42 +05:30
Nabin Hait
7f540af7a6 bumped to version 7.1.18 2016-11-23 15:23:42 +06:00
Nabin Hait
b18ad55e2b minor fixes 2016-11-23 14:51:30 +05:30
Nabin Hait
b439afb5e5 Merge pull request #7045 from saurabh6790/root_type_fix_and_other
[fix] Root type fix
2016-11-23 14:46:05 +05:30
Nabin Hait
cf895c220c Update account_tree.js 2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0 [fix] remove root type selection while created new node and hooks call to initialize payment gateway 2016-11-23 14:06:14 +05:30
Nabin Hait
ae8df2b01c Merge pull request #7033 from strixaluco/develop
[docs] URL fixes
2016-11-23 13:27:01 +05:30
Nabin Hait
b91aed807a Merge pull request #7042 from RobertSchouten/naming_series
[fix] naming series only show non disabled role doctypes
2016-11-23 13:26:19 +05:30
Nabin Hait
a748849fa3 Merge pull request #7043 from nabinhait/dn_qa_fix
delivery note dashboard fix for quality inspection
2016-11-23 11:47:59 +05:30
Nabin Hait
4059fb3961 delivery note dashboard fix for quality inspection 2016-11-23 11:45:19 +05:30
robert schouten
085706bcbf [fix] naming series only show non disabled role doctypes 2016-11-23 13:57:21 +08:00
Rushabh Mehta
5dd12cb4f0 Merge branch 'master' into develop 2016-11-22 23:18:29 +05:30
Rushabh Mehta
8685225644 Merge branch 'hotfix' 2016-11-22 23:18:28 +05:30
Rushabh Mehta
6557e37d5c bumped to version 7.1.17 2016-11-22 23:48:28 +06:00
Rushabh Mehta
698c040d21 [hot] fix quotation (#7039) 2016-11-22 23:16:40 +05:30
Kanchan Chauhan
2c1f399479 Apply Pricing Rule in Shopping Cart 2016-11-22 22:23:31 +05:30
Rushabh Mehta
4e61564f73 [minor] fixes to daily work summary formatting 2016-11-22 21:59:20 +05:30
strixaluco
fc6a3aa42c [docs] URL fixes 2016-11-22 16:25:20 +08:00
Nabin Hait
c381327e6e Merge pull request #7032 from rohitwaghchaure/patch_issue
fix patch
2016-11-22 13:51:51 +05:30