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

9468 Commits

Author SHA1 Message Date
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
Rohit Waghchaure
7488cf1ce1 [Fix] country wise tax, country name issue 2016-10-28 18:01:43 +05:30
Nabin Hait
9dcb778f17 bumped to version 7.1.1 2016-10-27 19:44:54 +06:00
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
Rohit Waghchaure
53a28eb39d [Fix] No permission to read report Bank Clearance Summary for account user 2016-10-27 11:46:10 +05:30
bcornwellmott
7ef2c0fc34 Fix calendar view for Timesheet 
All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times.
 2016-10-26 11:02:48 -07:00
Nabin Hait
62616a03b3 bumped to version 7.1.0 2016-10-26 18:26:16 +06:00
Nabin Hait
6d1eda812d Update __init__.py 2016-10-26 17:54:47 +05:30
Nabin Hait
72cee33b3a [translations] 2016-10-26 17:45:06 +05:30
Nabin Hait
72a1943c8e Fixed version conflict 2016-10-26 16:41:21 +05:30
Nabin Hait
f3882d2699 bumped to version 7.0.63 2016-10-26 17:10:44 +06:00
Nabin Hait
2e12a76d18 Merge pull request #6716 from nabinhait/develop 
Change Logs for v7.1
 2016-10-26 16:37:10 +05:30
Nabin Hait
7f19a24e5e Merge pull request #6705 from KanchanChauhan/get-serial-no 
Fetch serial no by default
 2016-10-26 16:31:11 +05:30
Nabin Hait
c5cbde273f Change Logs for v7.1 2016-10-26 16:28:54 +05:30
Kanchan Chauhan
0a3f2c818a Fetch serial no by default 2016-10-26 14:59:43 +05:30
Nabin Hait
683c4798b5 Merge pull request #6714 from KanchanChauhan/balance-sheet-error 
[Fix] Error in Balance Sheet Report
 2016-10-26 14:27:33 +05:30
Nabin Hait
a3c24385cf Merge pull request #6710 from frappe/bcornwellmott-patch-1 
[Minor] Add details to MRs from PPT
 2016-10-26 13:06:22 +05:30
Nabin Hait
e0aaea20af Merge pull request #6701 from shreyasp/modify-submit-docs 
[Fix] Make purchase order item reqd_date modifiable after submit
 2016-10-26 13:05:11 +05:30
Kanchan Chauhan
dc3198a11c [Fix] Error in Balance Sheet Report 2016-10-26 13:05:08 +05:30
Shreyas Patil
6c7d6e095b Update purchase_order_item.json 2016-10-26 12:47:35 +05:30
shreyas
fd04d62c2e [Minor] Added expected_delivery_date to purchase order item doctype 2016-10-26 12:38:31 +05:30
Nabin Hait
821331b3c0 Merge pull request #6712 from neilLasrado/develop 
Allow rename of student doctype
 2016-10-26 12:32:20 +05:30
Neil Trini Lasrado
a3f2a47020 Allow rename of student doctype 2016-10-26 12:24:27 +05:30
Revant Nandgaonkar
0bb92ab7a0 [docs] Email and Phone validation on Custom Fields (#6703) 2016-10-26 11:05:12 +05:30
bcornwellmott
30df3cd3dc Add description, stock UOM and Min Order Qty to MRs 
The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.
 2016-10-25 14:21:26 -07:00
shreyas
99e063f831 [Fix] Make purchase order item reqd_date modifiable after submit 2016-10-25 12:44:27 +05:30
Nabin Hait
ffd2fc5101 [fix] Validate if warehouse is not linked to any account 2016-10-24 18:54:07 +05:30
Nabin Hait
d662502f3c [fix] Validate if warehouse is not linked to any account 2016-10-24 18:17:57 +05:30
Nabin Hait
c00b17a6e0 Update project.json 2016-10-24 17:53:06 +05:30
Nabin Hait
fe86debf5d [fix] Duplicate salary components 2016-10-24 17:47:18 +05:30
Nabin Hait
0f9d60099d Merge pull request #6692 from neilLasrado/develop 
Typo fix
 2016-10-24 16:46:27 +05:30
Nabin Hait
a02fb1541a Merge pull request #6553 from saurabh6790/scrap_management 
Scrap management
 2016-10-24 16:46:13 +05:30
Nabin Hait
1f3771cdf1 Merge pull request #6687 from KanchanChauhan/lead-changes 
Contact by and contact date validations
 2016-10-24 16:44:08 +05:30
Rohit Waghchaure
43b508089e [Fix] Pricing rule discount issue 2016-10-24 16:16:24 +05:30
Neil Trini Lasrado
5ddd7acdbd Typo fix 2016-10-24 15:25:47 +05:30
Saurabh
8c3764a6ef test case for scrap item 2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9 added get_scrap_items param to get_bom_items_as_dict 2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7 [enhance] scrap management 2016-10-24 13:55:36 +05:30
Saurabh
464c27e189 [feature] scrap management 2016-10-24 13:55:36 +05:30
Kanchan Chauhan
a1cedbc7b2 Contact by and contact date validations 2016-10-24 13:51:13 +05:30
Umair Sayed
a56775ce9a Update domainify.py 2016-10-24 13:00:17 +05:30
Nabin Hait
f430d73daf Merge pull request #6662 from PawanMeh/fixes_6363 
[fix] #6363
 2016-10-24 11:56:43 +05:30
Nabin Hait
00b3443b61 Merge pull request #6653 from shreyasp/cust-credit-limit 
[Minor] Do not allow change in credit limit
 2016-10-24 11:55:24 +05:30
Nabin Hait
a221f7ec5d Update test_customer.py 2016-10-24 11:27:56 +05:30
Pawan Mehta
297e725727 Update project.json 2016-10-24 11:24:38 +05:30
Nabin Hait
df366a6e9c Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio 
Warning if there are mutliple active salary structures
 2016-10-24 11:23:57 +05:30
Mainul Islam
a964db7821 Add multiple emoloyee in salary structure (#6621) 
* Add multiple emoloyee in salary structure

* Added in Menu

* Remove Default Value from Company field

* Change Section Label

* Added Button in Salary Structure and set route_options

* Remove Single Doctype

* Add Dialog for Employee Add

* View Employee and Check or Uncheck

* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees

* Employees View Section in Dialog Added Employe Name and set Employee Id as Title

* Delete SIngle Doctype

* Chagne  to

* Remove checkbox

* Remove add button and set primary button
 2016-10-24 11:22:00 +05:30
Nabin Hait
1db35ce79a Merge pull request #6651 from shreyasp/del-company-txn 
Delete Communications while Deleting Company Transactions
 2016-10-24 11:20:29 +05:30
Nabin Hait
6ef8ede280 Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip 
include_holiday being taken into consideration while calculating lwp
 2016-10-24 11:19:43 +05:30
Nabin Hait
5ced4dfe34 Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix 
[Fix] leave application days should be less than max days leave allowed
 2016-10-24 11:18:44 +05:30
pawan
03a77b1b65 [fix] 6363 2016-10-24 11:18:29 +05:30
pawan
46ead70be8 [fix] fixes_6363 2016-10-24 11:18:29 +05:30
pawan
9a43a2a97b [fix] #6363 2016-10-24 11:18:29 +05:30
pawan
28ad58905d [fix] #6363 2016-10-24 11:18:29 +05:30
pawan
8d187def12 [fix] #6363 2016-10-24 11:18:29 +05:30
Nabin Hait
8918dcf54e Merge pull request #6678 from KanchanChauhan/total-leave-days-updated 
Total leave days gets updated on date change
 2016-10-24 11:13:31 +05:30
Nabin Hait
988f850fe2 Merge pull request #6682 from KanchanChauhan/makebankentry-button-fix 
[Fix] Make Bank Entry button depends_on fixed
 2016-10-24 11:12:17 +05:30
shreyas
f09929ea92 [Fix] Updated test cases to handle negative or zero outstanding amount against customer 2016-10-24 10:35:30 +05:30
shreyas
17f43da2a6 [Test] Added test cases to evaluate customer credit limit 2016-10-24 10:21:05 +05:30
shreyas
e05656963a [Minor] Do not allow change in credit limit 2016-10-24 10:21:04 +05:30
shreyas
c48eb45410 [Fix] Use company_fieldname as parameter to the query 2016-10-24 10:18:28 +05:30
shreyas
0f4cb55c3c [Fix] Delete communications before deleting the docs 2016-10-24 10:04:26 +05:30
shreyas
54d8590064 [Fix] Delete communications when user deletes company transactions 2016-10-24 10:04:26 +05:30
Kanchan Chauhan
55106ab66b Warehouse based on selected Company 2016-10-22 21:42:28 +05:30
Kanchan Chauhan
29ce0aab28 Warning if there are mutliple active salary structures 2016-10-22 20:48:44 +05:30
Kanchan Chauhan
c4c966691f [Fix] Make Bank Entry button depends_on fixed 2016-10-22 18:04:48 +05:30
Kanchan Chauhan
a084405bca Total leave days gets updated on date change 2016-10-22 11:55:51 +05:30
Kanchan Chauhan
a1006c0549 include_holiday being taken into consideration while calculating lwp 2016-10-21 17:53:15 +05:30
Kanchan Chauhan
24d580206a [Fix] leave application days should be less than max days leave allowed 2016-10-21 13:01:33 +05:30
Nabin Hait
db88bd66b0 Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop 2016-10-20 16:59:40 +05:30
Nabin Hait
376449ff41 Merge pull request #6659 from shreyasp/selling-price-validation 
[Minor] Validate purchase price against selling price
 2016-10-20 16:46:35 +05:30
Nabin Hait
9f26bc16b7 Update selling_controller.py 2016-10-20 16:45:53 +05:30
Rohit Waghchaure
69be01aa1b [Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer 2016-10-20 16:38:30 +05:30
Nabin Hait
725b547641 Merge pull request #6657 from rohitwaghchaure/invoice_unlink_feature 
[Feature] Provision to allow unlink the payment against the invoice
 2016-10-20 16:36:57 +05:30
Rohit Waghchaure
18fa0d8691 patch to set default value as 1 2016-10-20 16:16:28 +05:30
Nabin Hait
938c858720 Merge pull request #6513 from KanchanChauhan/group-similar-item-in-po 
Group similar items in PO
 2016-10-20 16:11:24 +05:30
Rohit Waghchaure
7917ff6936 Test cases 2016-10-20 16:11:22 +05:30
Rohit Waghchaure
8055bd39ba [Feature] Provision to allow unlink the payment against the invoice 2016-10-20 16:11:22 +05:30
Nabin Hait
05245d6328 Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss 
Demo fixed for Process Payroll and Salary Structure
 2016-10-20 16:05:08 +05:30
Kanchan Chauhan
1c1e2e9cbe Demo fixed for Process Payroll and Salary Structure 2016-10-20 16:04:09 +05:30
shreyas
e8aaa92816 [Minor] Some more fixes to the code 2016-10-20 15:57:45 +05:30
shreyas
edcba51c8b [Fix] Added check to validate selling price against valuation rate 2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45 [Minor] Validate purchase price against selling price 2016-10-20 15:57:45 +05:30
Nabin Hait
6fb7b162e8 Create tax template based on country 2016-10-20 15:56:07 +05:30
Rohit Waghchaure
d23835be84 [Feature] Countrywise sales tax template 2016-10-20 15:56:07 +05:30
Kanchan Chauhan
cce16b29b0 Group similar items in PO 2016-10-20 14:31:34 +05:30
Saurabh
bc0783b527 [fix] duplicate columns in monthly salary report #6623 2016-10-20 12:55:23 +05:30
Kanchan Chauhan
025fbd8f14 Customer group added to Gross Profit report 2016-10-20 12:54:06 +05:30
Nabin Hait
97fa119b37 Set prefered contact email in Employee 2016-10-19 18:26:01 +05:30
Nabin Hait
0702fa2fc6 Fixed version conflict 2016-10-19 16:49:36 +05:30
Nabin Hait
13a07c2029 bumped to version 7.0.62 2016-10-19 17:18:04 +06:00
Rohit Waghchaure
aa8abfa5b3 Test cases added in sales order to check total projected qty 2016-10-19 15:26:10 +05:30
Rohit Waghchaure
ac9172f6df [Fix] total projected qty 2016-10-19 15:06:30 +05:30
Nabin Hait
44b4e5eef3 Merge pull request #6648 from saurabh6790/hotfix 
[fix] calculate variance only for submitted budgets
 2016-10-19 15:05:11 +05:30
Nabin Hait
ff183eedb9 Fixes for testcases 2016-10-19 14:23:02 +05:30
Saurabh
afceac620c [fix] calculate variance only for submitted budgets 2016-10-19 12:49:48 +05:30
Faris Ansari
2acbb11923 [fix] print format image size 2016-10-19 12:08:00 +05:30
Nabin Hait
2b03d8f696 Merge pull request #6641 from JayVora-SerpentCS/develop 
Pythonic corrections
 2016-10-19 10:47:01 +05:30
Nabin Hait
a7a3a497d5 Fixed version conflict 2016-10-18 18:35:42 +05:30
Nabin Hait
8872842edf bumped to version 7.0.61 2016-10-18 19:05:18 +06:00
Rushabh Mehta
7791ed845f [hot] [fix] student_dashboard.py 2016-10-18 18:33:19 +05:30
Nabin Hait
a943ec8ff5 Merge pull request #6642 from neilLasrado/develop 
Fixes to Schools Module
 2016-10-18 18:16:29 +05:30
Neil Trini Lasrado
377da58378 Set Student Name in Program Enrollment 2016-10-18 18:11:52 +05:30
Serpent Consulting Services Pvt Ltd
8b231f7256 Pythonic corrections 2016-10-18 17:30:24 +05:30
Nabin Hait
6cb44133c3 Fixed version conflict 2016-10-18 16:18:34 +05:30
Nabin Hait
170b0cc83c bumped to version 7.0.60 2016-10-18 16:48:17 +06:00
Nabin Hait
d5c4a5c802 Hotfix 2016-10-18 16:17:37 +05:30
Nabin Hait
fa1cdd5bf0 Fixed merge conflict 2016-10-18 15:37:33 +05:30
Nabin Hait
7b9e8368ea bumped to version 7.0.59 2016-10-18 15:55:31 +06:00
Nabin Hait
f32547a414 Merge pull request #6637 from nabinhait/cost_center_fix 
Set cost center while creating invoice from SO/PO
 2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450 [minor] [fix] doctype_dasboard.py files, move data to get_data 2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919 Set cost center while creating invoice from SO/PO 2016-10-18 14:54:17 +05:30
Neil Trini Lasrado
8b3dd8fdf2 Changed nationality in student master from link to data field 2016-10-18 12:55:38 +05:30
Kanchan Chauhan
dc86964e91 Patch fixed for Employee 2016-10-18 11:29:41 +05:30
Nabin Hait
b3b1219109 Fixed merge conflict 2016-10-17 17:42:53 +05:30
Nabin Hait
fcd10f2e08 Merge pull request #6335 from RobertSchouten/stock_entry 
[fix] warning for creating stock entry after sales invoice (causing missing gl entries)
 2016-10-17 17:39:57 +05:30
Nabin Hait
e5eed00aa5 Update stock_entry.py 2016-10-17 17:37:35 +05:30
Pawan Mehta
1a96cc1e8d Fixes 6171 (#6417) 
* [fix] #6171

* [fix] #6171

* [fix] #6171

* [fix] #6171

* [fix] #6171

* [fix] #6171

* [fix] #6171

* [fix] #6171
 2016-10-17 17:02:12 +05:30
KanchanChauhan
81581c669f No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626) 2016-10-17 17:01:29 +05:30
Nabin Hait
437b32d32c Added filter to show unclosed fiscal year's P&L balances in trail balance 2016-10-17 16:57:52 +05:30
Nabin Hait
425bdee0ec Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1 2016-10-17 16:46:54 +05:30
Nabin Hait
395d757c5a Fixed merge conflict 2016-10-17 16:42:49 +05:30
KanchanChauhan
9cb69ca0e3 Posting Date cannot be future date (#6628) 2016-10-17 16:40:16 +05:30
Saurabh
048ee48475 [fix] #6573 Material Request Required Date auto set (#6627) 2016-10-17 16:24:20 +05:30
Faris Ansari
e1416c3dda Update sales-invoice.md frappe/erpnext#6507 (#6629) 
* Update sales-invoice.md

* add pos-invoice screenshot
 2016-10-17 16:22:43 +05:30
Nabin Hait
401be3f49b Merge pull request #6577 from PawanMeh/fixes_6566 
[fix #6566]
 2016-10-16 14:28:26 +05:30
Nabin Hait
a9ce406c48 Merge pull request #6579 from PawanMeh/fixes_6567 
[fix] #6567
 2016-10-16 14:28:00 +05:30
Nabin Hait
e040510545 Always calculate additional discount amount if percentage is mentioned 2016-10-13 12:14:47 +05:30
Rushabh Mehta
b62ed7a603 [fix] install issue 2016-10-13 11:00:00 +05:30
Rushabh Mehta
257bbbe588 [refactor] has_website_permission parameters 2016-10-12 10:53:34 +05:30
RobertSchouten
bb7308bbc1 [fix] email digest date range starting with opening balance of day one not closing (#6524) 
ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august
 2016-10-10 17:17:39 +05:30
Saurabh
afa14fc402 [fix][minor] (#6449) 2016-10-10 17:17:17 +05:30
Nabin Hait
1765259043 Merge pull request #6591 from vrms/patch-4 
Update managing-fixed-assets.md
 2016-10-10 17:12:58 +05:30
Rushabh Mehta
2757d8ef03 [minor] [perm] allow owner to read student applicant 2016-10-10 16:46:24 +05:30
Rohit Waghchaure
8e881cc7b9 [Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order 2016-10-10 14:58:33 +05:30
Faris Ansari
a0608d463a [gantt] Gantt fixes (#6490) 
* [gantt] fix Gantt Chart link in Modules

* [gantt] added field for Task dependent
 2016-10-10 14:32:35 +05:30
vrms
e4e8bfae9f Update managing-fixed-assets.md 
Sale an asset > Sell and Asset
 2016-10-10 15:33:27 +08:00
Nabin Hait
fc90758932 Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue 
[Fix] Purchase invoice validation issue
 2016-10-10 11:51:00 +05:30
Rohit Waghchaure
3485d2467a [Fix] Purchase invoice validation issue 2016-10-09 18:05:17 +05:30
Rohit Waghchaure
6f33dfbc56 [Fix] wildcard search for pos not working 2016-10-09 15:32:56 +05:30
Rushabh Mehta
ac5b193100 [minor] direct student admission to the list page 2016-10-09 15:19:23 +05:30
Pawan Mehta
8d62af627a Update fiscal-year.md 2016-10-09 09:20:12 +05:30
pawan
1c0ecede06 [fix] #6567 2016-10-09 09:06:49 +05:30
pawan
896c731a46 [fix] #6566 2016-10-09 08:44:40 +05:30
pawan
05790d1b38 [fix] #6566 2016-10-09 08:30:29 +05:30
pawan
5655ce936b [fix] #6567 2016-10-08 08:02:08 +05:30
pawan
361739ffb6 [fix #6566] 2016-10-07 19:00:30 +05:30
Nabin Hait
fc2a9e64fc Fixed version conflict 2016-10-07 17:09:28 +05:30
Nabin Hait
89326b366d bumped to version 7.0.58 2016-10-07 17:38:57 +06:00
Nabin Hait
6aaa7d7742 Added missing file extension 2016-10-07 17:08:03 +05:30
Nabin Hait
df61513037 Fixed merge conflict 2016-10-07 17:05:00 +05:30
Nabin Hait
d17bbdeb4d bumped to version 7.0.57 2016-10-07 17:34:35 +06:00
Nabin Hait
2f3a68b8d6 Added missing file extension 2016-10-07 17:03:37 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Nabin Hait
06195de812 bumped to version 7.0.56 2016-10-07 17:17:17 +06:00
Nabin Hait
ad8218e5ac minor fix 2016-10-07 16:39:30 +05:30
Nabin Hait
9bfef84545 Merge branch 'notification-center' of https://github.com/shreyasp/erpnext into shreyasp-notification-center 2016-10-07 16:37:10 +05:30
Nabin Hait
81754954cb Update update_timesheet_communications 2016-10-07 16:08:44 +05:30
Nabin Hait
2907881dfb Update update_timesheet_communications 2016-10-07 16:07:11 +05:30
Nabin Hait
0799969063 Update set_portal_settings.py 2016-10-07 14:55:17 +05:30
Nabin Hait
20e96b77bd Update set_portal_settings.py 2016-10-07 14:54:28 +05:30
shreyas
c1b7104126 [Fix] Minor changes to logic 2016-10-07 14:20:51 +05:30
Nabin Hait
2f75b7b42e Fixed merge conflict 2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633 [Fix] sales order status showing completed, while it's status was to bill 2016-10-07 13:55:48 +05:30
Rohit Waghchaure
022d87969d [Fix] Issue in merging duplicate item 2016-10-07 13:40:45 +05:30
shreyas
a1d7646e70 [Fix] Allow user to save Notification Control without selecting transaction 2016-10-07 12:58:58 +05:30
Nabin Hait
16f3f378f6 Update patches.txt 2016-10-07 12:54:27 +05:30
Nabin Hait
1885207eca Update and rename update_timesheet_modified_created to update_timesheet_communications 2016-10-07 12:54:04 +05:30
RobertSchouten
e0a636c081 [fix] update timestamps and relink communication for timesheet 2016-10-07 11:03:04 +08:00
RobertSchouten
ef4e41380b [fix] update timestamps and relink communication for timesheet 2016-10-07 11:01:12 +08:00
Saurabh
a2a25abfa5 [fix] warehouse account rename fix #6526 2016-10-06 18:20:53 +05:30
Nabin Hait
77ede941b0 Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry 
[Enhancement] Option to make payment via Journal Entry
 2016-10-06 17:07:11 +05:30
Rohit Waghchaure
7d5298997b Documentation for payments 2016-10-06 16:49:39 +05:30
Nabin Hait
1397159bc1 Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log 
removed sales invoice from scheduler log
 2016-10-06 15:32:55 +05:30
Nabin Hait
ec08a50af1 Merge pull request #6564 from rohitwaghchaure/expense_claim_issue 
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
 2016-10-06 15:32:37 +05:30
Rohit Waghchaure
370e711f48 [Fix] Expense Claim, sanctioned amount not auto-populated from claim amount 2016-10-06 15:19:53 +05:30
Saurabh
3ae5672e27 [fix] sales order translation for language code: fr 2016-10-06 12:57:21 +05:30
Rohit Waghchaure
297fbcd388 removed sales invoice from scheduler log 2016-10-06 12:40:09 +05:30
Rohit Waghchaure
b7a5502b97 [Enhancement] Option to make payment via Journal Entry 2016-10-06 12:04:52 +05:30
vrms
bbe7a1062e Update product-bundle.md 
tried to work out the mechanics of Parent and Child items a little clearer
 2016-10-06 07:40:21 +08:00
Rushabh Mehta
4dacaa103c [minor] do not submit after accpeting payment 2016-10-05 19:20:37 +05:30
Rushabh Mehta
a47652624a [minor] student applicant fixes 2016-10-05 18:04:35 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
7dcab89321 Merge branch 'hotfix' 2016-10-05 17:18:11 +05:30
Nabin Hait
a162b3f0cd bumped to version 7.0.55 2016-10-05 17:48:11 +06:00
Nabin Hait
cccc45edc5 Don't throw expense account validation on fetching item details 2016-10-05 17:15:53 +05:30
Nabin Hait
33fafb7728 Set warranty claim resolution date as today only if it is not set 2016-10-05 16:43:20 +05:30
Nabin Hait
2704a4a8fc Update production_order.py 2016-10-05 16:14:42 +05:30
Nabin Hait
7c0fe7d9d3 Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations 
[Enhancement] Added supplier quotation link on rfq
 2016-10-05 15:44:51 +05:30
Rohit Waghchaure
a26f685b9f [Enhancement] Added supplier quotation link on rfq 2016-10-05 15:04:50 +05:30
Rohit Waghchaure
e86eaf543c removed sync master data onload of the pos page 2016-10-05 14:45:15 +05:30
Rohit Waghchaure
163e3598c7 [Fix] POS wildcard search for customers, items 2016-10-05 13:52:17 +05:30
Nabin Hait
babafb8d01 Merge pull request #6531 from saurabh6790/je_currency_symbol_fix 
[fix] currency symbol for total amount in JE
 2016-10-05 13:12:59 +05:30
Nabin Hait
7229b64128 Merge pull request #6516 from bcornwellmott/patch-6 
Update request_for_quotation.html
 2016-10-05 13:12:09 +05:30
Nabin Hait
8db8a91d2e Minor fixes 2016-10-05 13:11:19 +05:30
Kanchan Chauhan
f6f8ec68ad Total and difference added for amount and qty 2016-10-05 13:11:19 +05:30
Rohit Waghchaure
712b871f06 Change project location in sales invoice 2016-10-05 12:45:56 +05:30
Neil Trini Lasrado
d5035e05b3 Field rearrange in student applicant 2016-10-05 12:35:55 +05:30
Nabin Hait
9501b38e8b Update remove_doctypes_and_reports.py 2016-10-05 12:35:11 +05:30
Nabin Hait
219148d23d Sales Personwise transaction summary - total row 2016-10-05 12:26:51 +05:30
Nabin Hait
9ac2fc932d Validate dates, fixes #6542 2016-10-05 12:20:25 +05:30
Nabin Hait
6c49fa20b5 Fixed precision of rate field 2016-10-05 11:28:02 +05:30
Rushabh Mehta
bb89f6e151 [minor] student applications to be submitted after payment 2016-10-05 09:24:52 +05:30
Nabin Hait
efa68fb6b8 Fixed version conflict 2016-10-04 17:27:02 +05:30
Nabin Hait
d5cebd7bb4 bumped to version 7.0.54 2016-10-04 17:56:33 +06:00
Rushabh Mehta
6a1742abc8 [minor] status for student applicant 2016-10-04 16:26:32 +05:30
Nabin Hait
80de91776d Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue 
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
 2016-10-04 16:20:47 +05:30
Nabin Hait
cf87027422 Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue 
[Fix] Multi company issue for POS
 2016-10-04 16:20:24 +05:30
Rohit Waghchaure
661db8ba71 [Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record 2016-10-04 14:46:34 +05:30
Rohit Waghchaure
82be020ae9 sync offline sales invoices from the POS 2016-10-04 12:58:48 +05:30
Nabin Hait
66d49565d2 Merge pull request #6536 from frappe/umairsy-patch-4 
Update supplier.md
 2016-10-04 12:25:45 +05:30
Rushabh Mehta
3af3d7abe3 [fixes] admission-applicant link and student applicant fixes 2016-10-04 12:20:47 +05:30
Rohit Waghchaure
6f1d012b65 [Fix] Multi company issue for POS 2016-10-04 12:18:59 +05:30
Umair Sayed
06b88a464d Update supplier.md 2016-10-04 12:10:08 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Saurabh
f24d523fc9 [fix] currency symbol for total amount in JE 2016-10-04 11:29:26 +05:30
Nabin Hait
7fb79d175f Fixed version conflict 2016-10-03 18:05:34 +05:30
Nabin Hait
e2b8ae56e1 bumped to version 7.0.53 2016-10-03 18:35:10 +06:00
Nabin Hait
d114aca20d GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items 2016-10-03 17:36:28 +05:30
Faris Ansari
69ca382529 [fix] image size fix in print format 2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573 Merged introduction and eligibility into a single text field in Student Admission. (#6529) 2016-10-03 15:50:47 +05:30
Nabin Hait
5fd5a77750 Fixed version conflict 2016-10-03 14:13:50 +05:30
Nabin Hait
e7e920b487 bumped to version 7.0.52 2016-10-03 14:42:53 +06:00
Nabin Hait
e8519938e0 Merge pull request #6525 from rohitwaghchaure/minor_pos 
[Fix] disable apply discount on pos
 2016-10-03 14:10:44 +05:30
Nabin Hait
10a48ea5e9 Merge pull request #6527 from rohitwaghchaure/budget_issue 
[Fix] company key error during cancellation of stock entry
 2016-10-03 14:05:10 +05:30
Saurabh
4f62c4cf2d [minor][fix] for condition maker 2016-10-03 12:48:25 +05:30
Rohit Waghchaure
b1391ca635 [Fix] company key error during cancellation of stock entry 2016-10-03 12:25:04 +05:30
Rohit Waghchaure
6f3d04caf7 [Fix] Disable apply discount on 2016-10-03 11:46:04 +05:30
Nabin Hait
b498eb5f9e Minor fix AR/AP 2016-10-01 15:51:59 +05:30
bcornwellmott
47863a3049 Update request_for_quotation.html 
Fixing spelling mistakes
 2016-09-30 15:45:20 -07:00
Nabin Hait
e1aee56e85 Merge pull request #6515 from rohitwaghchaure/purchase_receipt_title_issue 
[Fix] Purchase receipt title issue
 2016-09-30 21:24:03 +05:30
Rohit Waghchaure
74bf022273 [Fix] Purchase receipt title issue 2016-09-30 18:35:48 +05:30
Rohit Waghchaure
c1a3e379d8 [Fixed] Accounts receivable concat issue 2016-09-30 13:18:06 +05:30
Nabin Hait
6870e45276 Merge pull request #6495 from frappe/umairsy-patch-2 
Update sales_partner.js
 2016-09-29 20:44:59 +05:30
Nabin Hait
7652d5db93 Merge pull request #6501 from rohitwaghchaure/minor_fix_warranty_claim 
[Fix] Minor changes in warranty claim
 2016-09-29 20:44:03 +05:30
Rohit Waghchaure
1d0b18661e [Fix] Minor changes in warranty claim 2016-09-29 18:55:45 +05:30
Umair Sayed
6c1c03efe7 Update data-import-tool.md 2016-09-29 16:34:39 +05:30
Umair Sayed
29a0b31ca6 Update sales_partner.js 2016-09-29 16:25:04 +05:30
Nabin Hait
2ad07f4912 Merge pull request #6491 from neilLasrado/develop 
Removed  Website Roles from Install Fixtures
 2016-09-29 15:39:15 +05:30
Nabin Hait
80499bb657 Fixed merge conflict 2016-09-29 14:18:53 +05:30
Nabin Hait
626fcd5199 bumped to version 7.0.51 2016-09-29 14:46:42 +06:00
Nabin Hait
2c452a6881 Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry 
[Enhancement] Added allocate payment amount checkbox in Payment Entry
 2016-09-29 13:57:48 +05:30
Nabin Hait
d0a25f72c7 Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue 
[Fix] Timesheet detail records not deleted with company transactions deletion
 2016-09-29 13:55:38 +05:30
Nabin Hait
424bffc98b Merge pull request #6486 from nabinhait/stock_trans_repost 
Reposting of GLE and SLE for all stock transactions
 2016-09-29 13:51:51 +05:30
Nabin Hait
473ccc410b Merge pull request #6489 from nabinhait/leave_application_fix 
[fix] Validate leave application period with salary slip only if leave type is LWP
 2016-09-29 13:49:31 +05:30
Nabin Hait
b81a7538b9 Merge pull request #6492 from rohitwaghchaure/patch_for_change_amount_account 
[Fix] added account for missing change amount account in the sales invoice
 2016-09-29 13:41:50 +05:30
Nabin Hait
f1d2fd2436 [fix] Accounts Receivable report if negative write off in invoice 2016-09-29 13:03:10 +05:30
Rohit Waghchaure
4b24683c27 [Fix] added account for missing change amount account in the sales invoice 2016-09-29 12:55:48 +05:30
Neil Trini Lasrado
3da7354ba4 removed supplier role from Request for Quotation 2016-09-29 11:57:23 +05:30