Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,448 Commits 3 Branches 0 Tags 1 GiB
414c0ab3bb
Commit Graph

9973 Commits

Author SHA1 Message Date
Nabin Hait
10de98c0be bumped to version 7.1.23 2016-12-09 16:15:45 +06:00
Nabin Hait
00ae31bd1c Merge pull request #7172 from nabinhait/hotfix 
Issue fixed in Quality Inspection, P&L period and purchase register
 2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8 Merge pull request #7171 from rohitwaghchaure/payment_entry_issue 
[Fix] Payment entry showing wrong invoice amount
 2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0 Fixed period end date if year starts in the middle of the month 2016-12-09 15:09:11 +05:30
Nabin Hait
76a8508d2b Unlink Quality Inspection from PR while cancelling QI 2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176 Fixed renamed fieldname 2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887 [Fix] Payment entry showing wrong invoice amount 2016-12-09 12:55:29 +05:30
Nabin Hait
abd5a92bcc Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1 
Exchange rate base on date
 2016-12-09 12:34:15 +05:30
Nabin Hait
a0fc404eb8 Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix 
[Fix] Quoted Item Comparison
 2016-12-09 12:18:06 +05:30
Nabin Hait
8e885163a3 Update quoted_item_comparison.py 2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1 date is optional in get_exchange_rate 2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0 Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups 
[Minor]Added type to Salary Components
 2016-12-09 11:50:43 +05:30
Viet Pham
ddb856377c Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null 2016-12-08 20:02:39 +07:00
Kanchan Chauhan
13f19993c5 [Minor]Added type to Salary Components 2016-12-08 17:50:15 +05:30
Kanchan Chauhan
5c031a3512 [Fix] Quoted Item Comparison 2016-12-08 17:29:04 +05:30
Kanchan Chauhan
0ece9e0e2e [Fix] Salary Slip Test cases fix 2016-12-08 17:02:36 +05:30
Nabin Hait
352d95344e Set exchange rate on change of date for Journal/Payment Entry 2016-12-08 16:06:47 +05:30
Nabin Hait
aa0d174d3d Replaced spaces with tabs 2016-12-08 15:44:16 +05:30
Nabin Hait
3113f00c46 Replaced spaces with tabs 2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc Fixes and patch for Currency Exchange based on date 2016-12-08 15:36:23 +05:30
Nabin Hait
b267a6c90e Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1 2016-12-08 14:45:12 +05:30
Nabin Hait
87d70279c6 get exchange rate on change of date 2016-12-08 14:43:11 +05:30
Nabin Hait
32e5b7af20 Update set_budget_against_as_cost_center.py 2016-12-08 14:42:04 +05:30
Nabin Hait
1cc55fbbcb Fixed merge conflict 2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b Merge pull request #7094 from manassolanki/budget 
[Enhancement] Budget Against Project #7036
 2016-12-08 13:52:33 +05:30
Nabin Hait
f5460e9e6f Merge pull request #6846 from KanchanChauhan/payroll-updates 
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
 2016-12-08 13:51:55 +05:30
Nabin Hait
ded059b253 [fix][tests] Fetching serial nos via get item details 2016-12-08 13:20:43 +05:30
Nabin Hait
1b9caf90dd Merge branch 'master' into develop 2016-12-08 12:33:54 +05:30
Nabin Hait
7b513891e3 bumped to version 7.1.22 2016-12-08 13:03:53 +06:00
Kanchan Chauhan
f7b25cbb6b [WIP] Payroll Updates 2016-12-08 12:20:20 +05:30
Manas Solanki
482fa672c2 [Fix] Patch for budget_against 2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c minor issue 2016-12-07 19:17:01 +05:30
Rohit Waghchaure
0327b35b5e [fix] timesheet datetime issue 2016-12-07 18:32:36 +05:30
Manas Solanki
2e0fbdeebe [Fix] Test Case 
- Previous test case fixed
- Additional test case for project against budget
 2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf [Fix] More optimized code 2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932 [Fix] Budget against Projects 
- Test case fixed
- Either cost center or project is mandatory
 2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482 [Enhancement] Budget against Project 2016-12-07 18:17:26 +05:30
Rushabh Mehta
b78fc37ce9 [minor] Add button to add help article from Issue #7132 (#7154) 2016-12-07 14:41:23 +05:30
James Robertson
e4b9473f83 Fixes erpnext issue 6891 (#7128) 
* Fixes erpnext issue 6891

Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.

* Update to Pull Request #7128

Changes to images to comply with guidelines.
 2016-12-07 12:14:51 +05:30
Rushabh Mehta
2167ff589c [minor] update font awesome icons 2016-12-07 11:09:02 +05:30
Nabin Hait
5c18bd9b61 Fixed merge conflict 2016-12-06 16:16:58 +05:30
Nabin Hait
bc2deafcf9 bumped to version 7.1.21 2016-12-06 16:44:44 +06:00
Nabin Hait
45fda8a257 Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave 
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
 2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491 Merge pull request #7127 from KanchanChauhan/salary-slip-fix 
[Fix] lwp issue fixed for salary slip without salary structure
 2016-12-06 15:48:47 +05:30
Nabin Hait
cb3f44716a Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue 
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
 2016-12-06 15:42:37 +05:30
Nabin Hait
9313a7408c Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue 
[Enhancement] Total row added for report builder
 2016-12-06 15:42:19 +05:30
Nabin Hait
e644ca8992 Merge pull request #7146 from RobertSchouten/digest_cache_dev 
[fix] email digest cache by frequency
 2016-12-06 15:41:33 +05:30
Nabin Hait
cacfb6839f Merge pull request #7138 from rohitwaghchaure/so_po_status_issue 
[Fix] Status of sales order and purchase order
 2016-12-06 15:40:57 +05:30
Kanchan Chauhan
dc80b35104 [Minor] Apply Salary Slip validation only if it is submitted 2016-12-06 15:37:24 +05:30
robert schouten
7f72cd0f97 [fix] email digest cache by frequency 2016-12-06 08:51:40 +08:00
Rohit Waghchaure
6f6a533d66 [fix] salary slip working days 2016-12-05 23:33:02 +05:30
Rohit Waghchaure
36a01d3464 [Enhancement] Total row added for report builder 2016-12-05 18:59:59 +05:30
Rohit Waghchaure
bcc6ea450a [fix] test cases for customer credit 2016-12-05 18:32:57 +05:30
Neil Trini Lasrado
f5c2cf4b5c Updated schools.py in Config 2016-12-05 17:53:41 +05:30
Rohit Waghchaure
c857f37f3a [fix] currecny symbol for customer's total annual billing, total unpaid amount 2016-12-05 17:44:06 +05:30
Neil Trini Lasrado
9e7ad6a630 Updated schools.py in Config 2016-12-05 17:28:07 +05:30
Nabin Hait
3f1c50a483 Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo 
[Fix] Fetch Serial No by default for  Delivery Note Item
 2016-12-05 16:51:42 +05:30
Nabin Hait
4306cc80d0 removed print 2016-12-05 16:51:30 +05:30
Rohit Waghchaure
82fa27c36f [Fix] Status of sales order and purchase order 2016-12-05 16:32:23 +05:30
Rushabh Mehta
86f8ab95f6 [minor] font-awesome fixes 2016-12-05 15:02:24 +05:30
Nabin Hait
12a396ef25 Merge pull request #7107 from RobertSchouten/timesheetdates 
calc timesheet dates on validate not just submit
 2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Kanchan Chauhan
4a888b4c91 [Fix] lwp issue fixed for salary slip without salary structure 2016-12-04 13:42:30 +05:30
Kanchan Chauhan
af0d6378f1 [Fix] Fetch Serial No by default for Delivery Note Item 2016-12-02 18:18:04 +05:30
Neil Trini Lasrado
6841b3198b Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance 2016-12-01 18:40:49 +05:30
Neil Trini Lasrado
305166b111 Fixes for Student Batch Wise attendance tool 2016-12-01 18:40:49 +05:30
Nabin Hait
14a4c729b3 Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart 
Apply Pricing Rule in Shopping Cart
 2016-12-01 18:09:34 +05:30
Nabin Hait
6c44d259ca Merge pull request #7106 from pratu16x7/doc-fixes 
CRM: Customer page fixes
 2016-12-01 18:09:02 +05:30
Nabin Hait
1ab446a810 Merge pull request #7086 from frappe/netchampfaris-documentation 
Update quotation.md
 2016-12-01 18:08:36 +05:30
Nabin Hait
cd43d3aa20 Merge pull request #7088 from rohitwaghchaure/documentation_november 
[fix] Documentation
 2016-12-01 18:08:05 +05:30
Nabin Hait
ee9d1b4520 Merge pull request #7099 from ishanloya/patch-1 
Update merging-documents.md
 2016-12-01 18:07:49 +05:30
Nabin Hait
feec1abb6e Merge pull request #7103 from bhupennewalkar1337/delivery-note-fix 
[Fix] Disallow same items to be fetched multiple times in sales invoice
 2016-12-01 18:07:28 +05:30
Nabin Hait
d97ec828b5 Merge pull request #7113 from rohitwaghchaure/edit_serial_no 
Allow user to edit serial no for credit note, debit note
 2016-12-01 18:06:58 +05:30
Neil Trini Lasrado
71aaeae91c Fixes for Student Batch-Wise Attendance report and Absent Student Report 2016-12-01 16:48:27 +05:30
Nabin Hait
1f1ffd79e2 Merge pull request #7109 from RobertSchouten/project_wise 
[fix] Project wise Stock Tracking is script report
 2016-12-01 16:12:46 +05:30
Nabin Hait
c92e2f9044 Update project_wise_stock_tracking.json 2016-12-01 16:12:35 +05:30
Rohit Waghchaure
2e8a94458d allow user to edit serial no for credit note, debit note 2016-12-01 16:04:41 +05:30
Neil Trini Lasrado
e6fb25cce8 Fixes for Student Batch-Wise Attendance report 2016-12-01 16:02:11 +05:30
Kanchan Chauhan
faa525e4f1 [Fix] Fixed condition and formula issue in Salary Slip 2016-12-01 15:31:38 +05:30
Neil Trini Lasrado
19e8bd2221 renamed 'active' in Student Batch to 'enabled' 2016-12-01 14:30:47 +05:30
Neil Trini Lasrado
c6e74680ee Added Instructor as a Role 2016-12-01 13:00:14 +05:30
Neil Trini Lasrado
2607898cde Added Student Batch-Wise Attendance report 2016-12-01 12:53:40 +05:30
robert schouten
81a5467c8f [fix] Project wise Stock Tracking is script report 2016-12-01 09:02:17 +08:00
robert schouten
0beb5bdea6 calc timesheet dates on validate not just submit 2016-12-01 08:51:03 +08:00
pratu16x7
9dd34427ef Change alt text and German page image link 2016-11-30 15:48:14 +05:30
pratu16x7
d849093dff CRM: Customer page fixes 2016-11-30 15:41:30 +05:30
bhupen
3c7e70ffb3 [Fix] Disallow same items to be fetched multiple times in sales invoice 2016-11-30 14:32:11 +05:30
Ishan Loya
a40cefeaeb Update merging-documents.md 
Fixed some typos
 2016-11-29 16:07:33 +05:30
Faris Ansari
a2ea2ca990 Update sales-order.md 2016-11-29 11:32:11 +05:30
Faris Ansari
8da43fe074 add selling-flow 2016-11-29 11:22:57 +05:30
Faris Ansari
d0654912c4 Update quotation.md 2016-11-29 11:21:40 +05:30
Neil Trini Lasrado
87edfef0bb Added ability to mark student batch in-active 2016-11-28 18:09:50 +05:30
Neil Trini Lasrado
331361d03b Added Absent Student Report 2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
14b27c5b42 New Doctype - Student Leave Application 2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
d3a410b0f3 Added Student Monthly Attendence Sheet Report 2016-11-28 16:57:30 +05:30
Rohit Waghchaure
59844a12aa [fix] documentation 2016-11-28 15:51:05 +05:30
Nabin Hait
7f3da5dbb1 Fixed merge conflict 2016-11-28 14:23:51 +05:30
Nabin Hait
edfca16931 bumped to version 7.1.20 2016-11-28 14:52:54 +06:00
Faris Ansari
834a3c990e fix image link 2016-11-28 13:16:57 +05:30
Faris Ansari
64d1c95afe add taxes gif 2016-11-28 13:15:29 +05:30
Faris Ansari
a9b34edef0 Update quotation.md 2016-11-28 13:08:49 +05:30
Nabin Hait
ac3ad62164 Merge pull request #7052 from saurabh6790/integration_service_document 
[documentaion] Documentaion for setting up Integration Service
 2016-11-28 12:43:21 +05:30
Nabin Hait
50a240e758 Merge pull request #7061 from rohitwaghchaure/cost_center_issue 
[Fix] Cost center group not showing data in the P&L report
 2016-11-28 12:42:48 +05:30
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
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
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
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
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
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
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
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
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
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
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
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
Nabin Hait
ee874a2a36 Update student_admission.py 2016-11-22 12:42:24 +05:30
Rushabh Mehta
9872d8cdb5 Revert "[optimize] remove count(*) from queries" 2016-11-21 21:04:47 +05:30
Nabin Hait
d3344ebcd1 Merge pull request #7021 from neilLasrado/develop 
Added Instructors table to Student Batch
 2016-11-21 19:36:11 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Neil Trini Lasrado
fb35b484a5 Added Instructors table to Student Batch 2016-11-21 19:10:13 +05:30
Nabin Hait
d75d3a927d bumped to version 7.1.16 2016-11-21 19:40:05 +06:00
Nabin Hait
4374ef5adc Merge pull request #6995 from neilLasrado/develop 
Added Student Batch Name & Batch Creation Tool in Schools Module.
 2016-11-21 19:08:15 +05:30
Nabin Hait
651d8e996b Merge pull request #7020 from nabinhait/balance_sheet_fix 
Provisional Loss related fix in Balance Sheet. Fixed #6918
 2016-11-21 19:06:42 +05:30
Nabin Hait
d01d74cafd Merge pull request #7019 from nabinhait/fix_10014 
Default warehouse is mandatory only for stock item in POS. Fixed #6893
 2016-11-21 19:06:30 +05:30
Nabin Hait
9789b50ae5 Merge pull request #7018 from nabinhait/fix_10013 
Set project from Sales Order while creating Material Request from PPT, fixed #6731
 2016-11-21 19:06:14 +05:30
Nabin Hait
5224a04628 Merge pull request #7016 from nabinhait/fix_10012 
Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636
 2016-11-21 19:05:50 +05:30
Nabin Hait
bdab3103e3 Merge pull request #7015 from nabinhait/fix_10011 
Multiple fixes
 2016-11-21 19:05:34 +05:30
Nabin Hait
09f7a7a977 Merge pull request #7013 from rmehta/remove-features-setup-docs 
[fix] remove feature setup docs
 2016-11-21 19:05:04 +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
Nabin Hait
3d5ef804b2 Provisional Loss related fix in Balance Sheet. Fixed #6918 2016-11-21 18:53:05 +05:30
Rushabh Mehta
0d5d4aefe5 [docs] added style 2016-11-21 18:47:00 +05:30
Neil Trini Lasrado
f89ffdb57a Fixes for student Attendance 2016-11-21 18:32:40 +05:30
Nabin Hait
977eff911f Default warehouse is mandatory only for stock item in POS. Fixed #6893 2016-11-21 18:29:16 +05:30
Nabin Hait
9b797974b5 Set project from Sales Order while creating Material Request from PPT, fixed #6731 2016-11-21 18:15:50 +05:30
Nabin Hait
075e33245e Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636 2016-11-21 18:09:55 +05:30
Neil Trini Lasrado
b444d5d81b Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool 2016-11-21 17:04:23 +05:30
Nabin Hait
fd23fa7c0b Prifitability report link added to accounts module page 2016-11-21 16:59:03 +05:30
Nabin Hait
542bf8f7d4 Party filter and total row for opening and closing in trial balance for party report 2016-11-21 16:58:50 +05:30
Rohit Waghchaure
4810d1fa2d patch for rename autoname field 2016-11-21 16:52:50 +05:30
Rushabh Mehta
1df70cedc1 [fix] remove feature setup docs 2016-11-21 16:38:13 +05:30
Neil Trini Lasrado
6566431fc5 Rearranged scheduling Tool 2016-11-21 16:21:25 +05:30
Neil Trini Lasrado
defdd784f4 Added Student Batch Name & Batch Creation Tool in Schools Module. 2016-11-21 16:21:25 +05:30
Rushabh Mehta
75d455422a [fix] [patch] rename_quality_inspection_field 2016-11-21 16:19:50 +05:30
Nabin Hait
8d161ef2e1 Merge pull request #6899 from shreyasp/docs-update 
Updated Docs for Purchase Order and Supplier Quotation
 2016-11-21 15:28:27 +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
Nabin Hait
e60d51b74c Merge pull request #6969 from rohitwaghchaure/pos_syncing_issue_and_enhancement 
User can able to add multiple item group, customer group in the POS profile.
 2016-11-21 15:27:41 +05:30
Rushabh Mehta
5a258cbc2d [optimize] remove count(*) from queries 2016-11-21 14:57:36 +05:30
Nabin Hait
5f166c11fc Merge pull request #6971 from ShraddhaRanjane/patch-2 
Update naming-series.md
 2016-11-21 14:52:22 +05:30
Nabin Hait
2d5b48c4f2 Update naming-series.md 2016-11-21 14:52:10 +05:30
Nabin Hait
b30e184f6b Merge pull request #7003 from KanchanChauhan/workstation-fix 
[Fix]Workstation holiday list
 2016-11-21 14:51:24 +05:30
Nabin Hait
d7faefc739 Merge pull request #7004 from KanchanChauhan/bom-error-fix 
[Fix] Better error message if default BOM not found
 2016-11-21 14:51:03 +05:30
Nabin Hait
0900407c18 Merge pull request #7010 from rmehta/duplicate-icon-patch-fix 
[patch] reload desktop icon #6826
 2016-11-21 14:50: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
8042aa4b52 [minor] fixes to docs 2016-11-21 13:53:02 +05:30
Rushabh Mehta
557e7f787b [minor] UX fixes for Daily Work Summary 2016-11-21 12:10:44 +05:30
Kanchan Chauhan
fdcfe180ad [Fix] Better error message if default BOM not found 2016-11-21 11:29:18 +05:30
Kanchan Chauhan
d33c44e3a5 [Fix]Workstation holiday list 2016-11-21 11:23:01 +05:30
Rohit Waghchaure
a27c417e48 fix master data sync performance issue 2016-11-20 23:41:13 +05:30
Nabin Hait
cbd26e3b2c Manual Depreciation Schedule for Asset 2016-11-18 17:19:45 +05:30
Rohit Waghchaure
2a81960e0b test cases 2016-11-18 15:33:11 +05:30
Rohit Waghchaure
801029e055 Added item groups, customer groups in the POS profile. 2016-11-18 15:32:48 +05:30
Manas Solanki
60db98aaff [Minor] Variable assignment before reference 
Variable = 'inspection_required_fieldname'
 2016-11-18 14:52:13 +05:30
Nabin Hait
5f453e7779 Merge pull request #6992 from rmehta/daily-work-summary 
[Feature] Daily Work Summary
 2016-11-18 14:00:08 +05:30
KanchanChauhan
49a50fef63 Group same item in SO print (#6959) 2016-11-18 13:57:53 +05:30
KanchanChauhan
dc2195c52a [Documentation] Shopping Cart (#6911) 2016-11-18 13:56:06 +05:30
Nabin Hait
8704dd3134 Merge pull request #6970 from komsel2228/develop 
fix bugs uom and conversion factor on stock entry
 2016-11-18 12:56:41 +05:30
Manas Solanki
99dac07a56 [Fix] Minor fix for field rename 2016-11-18 12:52:34 +05:30
Nabin Hait
c29c5210f9 Merge pull request #6972 from RobertSchouten/bankstatement 
[fix] update bank recon statement printing for payment entries
 2016-11-18 12:50:40 +05:30
Nabin Hait
a3a59ea895 Merge pull request #6973 from RobertSchouten/bankrecon 
[fix] layout for bank reconciliation
 2016-11-18 12:49:16 +05:30
Nabin Hait
684d44385f Merge pull request #6991 from rohitwaghchaure/delivery_note_issue 
[Fix] Delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item
 2016-11-18 12:45:31 +05:30
Nabin Hait
eae077e05d Merge pull request #6989 from RobertSchouten/financialprint 
[fix] financial printing and add to profitability
 2016-11-18 12:44:50 +05:30
Rushabh Mehta
9dd58d42df [fix] test cases and final wiring for daily work summary 2016-11-18 12:40:18 +05:30
Rushabh Mehta
c10d2a0025 [wip] daily work summary 2016-11-18 12:40:18 +05:30
Rushabh Mehta
fe816c3852 [fix] [wip] daily work summary 2016-11-18 12:40:18 +05:30
Rohit Waghchaure
e887e92dd4 Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item 2016-11-18 12:16:22 +05:30
robert schouten
0a1f3e4058 [fix] financial printing and add to profitability 2016-11-18 10:54:01 +08:00
Rohit Waghchaure
2ef7c7ae5c [Fix] Onload pull pos profile data for IS POS invoice 2016-11-17 17:29:10 +05:30
Nabin Hait
52f101d776 Merge pull request #6981 from neilLasrado/develop 
Added ability to mark attendance against a Student Batch
 2016-11-17 17:10:05 +05:30
Nabin Hait
652743b26e Merge branch 'master' into develop 2016-11-17 16:41:52 +05:30
Nabin Hait
f83302836c bumped to version 7.1.15 2016-11-17 17:11:51 +06:00
Nabin Hait
bd99a7cb5d Merge pull request #6980 from shreyasp/setup-wizard-domain 
[Fix] Updated 'FR' translation to prevent setup wizard failure
 2016-11-17 16:07:43 +05:30
Nabin Hait
46753de6d7 fixed merge conflict 2016-11-17 15:55:11 +05:30
Nabin Hait
f2b7ec919a bumped to version 7.1.14 2016-11-17 16:24:07 +06:00
Nabin Hait
f76aab6021 Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix 
[fix] on advance payment entry cancellation delink invoice and pyamen…
 2016-11-17 15:41:31 +05:30
Neil Trini Lasrado
d9bc5598b6 Added ability to mark attendance against a Student Batch 2016-11-17 15:36:14 +05:30
robert schouten
2b63e14089 dh drop guest from student attendance so disabling acedemic user disables all school doctypes (#6974) 2016-11-17 15:23:38 +05:30
Saurabh
1d210968de [fix] on advance payment entry cancellation delink invoice and pyament entry references 2016-11-17 15:21:46 +05:30
Nabin Hait
d4e8b297cd Merge pull request #6784 from RobertSchouten/calendar_fix 
[fix] calendar range fixes
 2016-11-17 14:45:59 +05:30
shreyas
0c93445be0 [Fix] Updated 'FR' translation to prevent setup wizard failure 2016-11-17 14:31:32 +05:30
Nabin Hait
7fc05d6432 Update update_missing_salary_component_type.py 2016-11-17 12:16:52 +05:30
robert schouten
a943535520 [fix] update bank recon statement printing for payment entries 2016-11-17 14:33:28 +08:00
robert schouten
60fb1b8643 [fix] layout for bank reconciliation 2016-11-17 14:30:47 +08:00
ShraddhaRanjane
045bfe641e Update naming-series.md 2016-11-17 11:22:58 +05:30
Ignatius Cuknoris
6471057df4 fix bugs uom and conversion factor on stock entry 2016-11-17 10:31:19 +07:00
Nabin Hait
aa68058910 Updated modified_datetime in production planning tool 2016-11-16 17:41:08 +05:30
Nabin Hait
8dd859920f Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart 
[Fix]Product thumbnail in Shopping Cart
 2016-11-16 17:34:17 +05:30
Nabin Hait
7f6b99aca4 Merge pull request #6962 from KanchanChauhan/payroll-fixes 
[Fix] Filters to get employee in Payroll
 2016-11-16 17:34:00 +05:30
Nabin Hait
8af429da1f Cleanup and fixes in quality inspection feature 2016-11-16 17:22:38 +05:30
Manas Solanki
55756d71b6 [Fix] Change of module of quality inspection 2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39 [Fix] Delivery Note fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
34feab1b25 [Fix] Redesign of quality inspection doctype 2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4 [Fix] Quality Inspection in Purchase Invoice fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6 Function in parent transaction.js and call from corresponding files 2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5 Quality Inspection Issue 
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
 2016-11-16 17:22:38 +05:30
mbauskar
e9747a8a6e [minor] fixes in validate selling price 2016-11-16 17:19:47 +05:30
Kanchan Chauhan
7652b857c8 [Fix] Filters to get employee in Payroll 2016-11-16 15:29:01 +05:30
Kanchan Chauhan
98f499a43e [Fix]Product thumbnail in Shopping Cart 2016-11-16 15:17:55 +05:30
Nabin Hait
535462fc20 Merge pull request #6947 from saurabh6790/delink_jv_from_advance 
[fix] delink jv from advance table
 2016-11-16 14:22:03 +05:30
Nabin Hait
e346a499c7 Merge pull request #6956 from rohitwaghchaure/payment_entry_issue 
[Fix] Payment entry, exchange rate is not set properly
 2016-11-16 14:15:52 +05:30
Saurabh
8adbfa8a09 [test-case] test cases for delinking advance payments 2016-11-16 13:43:01 +05:30
Saurabh
866c295989 [fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice 2016-11-16 13:43:01 +05:30
Nabin Hait
6d04afc19d fixed merge conflict 2016-11-16 12:56:31 +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
Rohit Waghchaure
9b18ed4ffe [Fix] Payment entry, exchange rate is not set properly 2016-11-16 12:24:40 +05:30
Rushabh Mehta
4bfa0748cd [merge] master 2016-11-16 11:28:23 +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
d209f21e76 bumped to version 7.1.11 2016-11-14 13:12:25 +06:00
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
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
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
549de70fa2 bumped to version 7.1.9 2016-11-09 15:25:29 +06:00
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
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
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
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
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
Faris Ansari
5049296f8d [ui] fix student image not visible (#6825) 2016-11-07 17:10:10 +05:30
Nagarajan
7b7b5bd340 Update getting-started-with-erpnext.md (#6832) 2016-11-07 17:09:41 +05:30
KanchanChauhan
dd01bcc485 Get employee details in Salary Slip (#6837) 2016-11-07 17:09:07 +05:30
robert schouten
27d45a244e [fix]fix name definition in old patch (#6841) 2016-11-07 17:08:37 +05:30
Nabin Hait
43eeddfaf6 Clear rows from Journal Entry if no debit/credit 2016-11-07 15:25:40 +05:30
Manas Solanki
546ca31a4e Notification Count Issue #5987 
Add notification count for Payment Entry in Accounts module page
 2016-11-05 11:47:24 +05:30
pratu16x7
a43639edb4 [fix] role fix for schools setup (#6824) 2016-11-05 10:09:53 +05:30
Rohit Waghchaure
0ecad33642 cleanup and fixes 2016-11-05 08:09:21 +05:30
Nabin Hait
f5d8dd3b18 Fixed merge conflict 2016-11-04 16:54:53 +05:30
Nabin Hait
a28c2d37f7 bumped to version 7.1.7 2016-11-04 17:23:17 +06:00
Nabin Hait
81f7a265bc Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value 
Remember last selected value for link field
 2016-11-04 16:13:49 +05:30
Nabin Hait
bd2d4762d9 Merge pull request #6817 from nabinhait/hotfix 
[fix] float division by zero
 2016-11-04 16:06:27 +05:30
Nabin Hait
4c46c3e94a Merge pull request #6774 from KanchanChauhan/salarystruct-process-payroll 
[Fix] Error in pulling in Salary Structure fixed
 2016-11-04 15:58:44 +05:30
Kanchan Chauhan
63dda84862 [Fix] Error in pulling in Salary Structure fixed 2016-11-04 12:58:05 +05:30
nagarajannxweb
a420c20bf9 Update salary-and-payroll.md 2016-11-04 12:30:14 +05:30
nagarajannxweb
4d100ac08b Update salary-and-payroll.md 2016-11-04 12:17:21 +05:30
Nabin Hait
e593f170a3 [fix] Patch order changed 2016-11-04 11:43:58 +05:30
Nabin Hait
43d2fec78e [fix] float division by zero 2016-11-04 10:58:30 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb Merge branch 'master' into develop 2016-11-03 15:17:39 +05:30
Nabin Hait
bb2ede8fab bumped to version 7.1.6 2016-11-03 15:47:38 +06:00
Nabin Hait
a3f393918d Merge pull request #6807 from nabinhait/hotfix 
[fix] Get data in opportunity dashboard
 2016-11-03 15:13:03 +05:30
Nabin Hait
9f5f534900 set item rate on first selection of item 2016-11-03 14:54:06 +05:30
Rohit Waghchaure
3844d2cc01 Remember last selected value for link field 2016-11-03 14:49:27 +05:30
Nabin Hait
1ac67b873c [fix] Get data in opportunity dashboard 2016-11-03 11:00:09 +05:30
Nabin Hait
ceca7fbc87 Merge pull request #6780 from rohitwaghchaure/float_issue 
Change fieldtype from float to currency
 2016-11-03 10:49:05 +05:30
Nabin Hait
57f51f648e Merge pull request #6795 from manassolanki/report 
Report: Bin - Item Shortage Report -- Should have Item Name and descr…
 2016-11-03 10:48:37 +05:30
Nabin Hait
4c5bd43ec0 Merge pull request #6794 from neilLasrado/hotfix 
Documentation Cleanup
 2016-11-03 10:41:23 +05:30
robert schouten
e32e2126f4 gantt fix 2016-11-03 08:10:30 +08:00
robert schouten
e8c1777c5f gantt fix 2016-11-03 08:10:03 +08:00
Rushabh Mehta
f87b7b0c4e [fix] typo 2016-11-02 10:53:53 +05:30
Rushabh Mehta
e855f53f08 [minor] fix ellipsis style 2016-11-02 07:34:17 +05:30
Rushabh Mehta
1aac956306 [minor] [fixes] can rename program and disable role on domainify 2016-11-02 07:33:18 +05:30
Rushabh Mehta
bdc8a88b4d [minor] fix date comparisons 2016-11-02 07:32:09 +05:30
Neil Trini Lasrado
f905ee9f0f Updated documentation for warehouse 2016-11-01 18:58:29 +05:30
Neil Trini Lasrado
8b99a06477 Projected qty image cleanup in documentation 2016-11-01 18:48:52 +05:30
Manas Solanki
5bc4784bad Report: Bin - Item Shortage Report -- Should have Item Name and description #4946 
New report is build including two new column Item name and item description
 2016-11-01 18:07:12 +05:30
Rohit Waghchaure
c84072b16f [Fix] jinja syntax issue 2016-11-01 17:58:10 +05:30
Nabin Hait
df01b5770b Merge branch 'master' into develop 2016-11-01 17:44:43 +05:30
Nabin Hait
74874d5785 bumped to version 7.1.5 2016-11-01 18:14:43 +06:00
Nabin Hait
06fe0c7c9d Merge pull request #6790 from neilLasrado/hotfix 
Hotfixes for demo
 2016-11-01 17:40:03 +05:30
Nabin Hait
8015d60e97 Merge pull request #6772 from frappe/bcornwellmott-patch-3 
[fix] Change communication to Linked
 2016-11-01 17:31:38 +05:30
Nabin Hait
c3b29f6a5b Merge pull request #6738 from KanchanChauhan/name-on-check 
Different name on Check
 2016-11-01 17:29:04 +05:30
Nabin Hait
6dc30c97bc Merge pull request #6788 from rohitwaghchaure/documentation 
Article for adjust withhold amount using payment entry
 2016-11-01 17:27:18 +05:30
Nabin Hait
dec9f2558e Update purchase_receipt.py 2016-11-01 17:24:46 +05:30
Neil Trini Lasrado
6da2b08cea Fixes for demo 2016-11-01 17:05:53 +05:30
Neil Trini Lasrado
9dde085144 Fixes to demo 2016-11-01 17:05:43 +05:30