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

15024 Commits

Author SHA1 Message Date
Rohit Waghchaure
ec2a2ac47e [Fix] patch 2018-06-12 01:16:28 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1 
fix the salary slip test cases
 2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d fix the salary slip test cases 2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158 Code cleanup and fixes for the asset 2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0 typo fixed 2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav 
Travis again
 2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c Patch for total quantity (#14458) 
* Add path to patches.txt

* Modify patch
 2018-06-11 17:32:17 +05:30
Jamsheer
0ca76323af Clinical Procedure Template - get_item_details - fix (#14449) 2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255
Merge pull request #14455 from frappe/kennethsequeira-patch-3 
Fix minor div issue in Accounts index page
 2018-06-11 16:33:51 +05:30
rohitwaghchaure
7cd59a2089
Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush 
[Fix] Alternative item, transferred qty issue for backflush method
 2018-06-11 15:44:37 +05:30
Shreya
9680dc476f Remove commented code 2018-06-11 15:40:09 +05:30
deepak-mnt
bb6753f206 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type 2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775 patch for sales partner type field 2018-06-11 14:53:25 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py 2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af
Fix minor div issue in Accounts 2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf [Fix] Alternative item, transferred qty issue for backflush method 2018-06-11 14:11:00 +05:30
Rohit Waghchaure
cdec44ee81 Removed company data from test item records 2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75 [tax-breakup] store itemized tax by item_name when can 2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14 toggle required fields on select of repayment option in loan application 2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016 [Enhance] Standalone debit/credit note (#14269) 
* [Enhance] Standalone debit/credit note

* Test cases

* Test cases and documentation

* Removed credit, debit note links from accounts module
 2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663
Merge pull request #14363 from frappe/manassolanki-patch-10 
PR to check the current state of Travis
 2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5 minor fix in account and account utils (#14432) 2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b Fix Employee tax declaration test case 2018-06-11 10:31:40 +05:30
Shreya
664f30a018 Fix asset maintenance json 2018-06-11 10:31:40 +05:30
Shreya
294238abfd Fix shopify test case 2018-06-11 10:31:39 +05:30
Shreya
956277b121 Fix tests 2018-06-11 10:31:39 +05:30
Zarrar
65994210f6 fix patch to add email template in hr settings (#14427) 2018-06-08 16:57:06 +05:30
Zarrar
44175904c6 Tree fix (#14425) 
* use frm.set_value instead of this.set_value

* generic methods moved to accounts/utils

* clean up code, and make use of methods added in utils
 2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf Add patch to set update_field and update_value (#14421) 
* Add patch to set update_field and update_value

- set update_field and update_value if empty
since expense claim workflow is dependent on it.

* Set update_field for workflow state of leave application

* Update patch entry

* Fix bug

* Update set_update_field_and_value_in_workflow_state.py
 2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13 [Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367) 
* Improve max crop period check and sort agriculture tasks chronologically

* Reformat crop cycle logic and add field to optimize task creation
 2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a Add Employee Status Temporary Leave (#14423) 2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717 [Fix] Travis data (#14422) 2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419) 
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
 2018-06-08 14:33:15 +05:30
Gaurav Naik
094617d29a Fix to allow migration of individual sites (#14413) 2018-06-08 11:44:27 +05:30
Shreya Shah
b9399d8781 Cancel attendance if leave application is cancelled (#14372) 
* Cancel attendance if leave application is cancelled

* Fix as per review
 2018-06-08 11:24:08 +05:30
Zarrar
8cd0f67b25 query fix if name contains apostrophe (#14370) 2018-06-07 16:48:31 +05:30
Zarrar
13f9851609 [Docs] Update doc for Supplier Group (#14373) 
* add breadcrumb for Supplier Group tree

* change occurrences of supplier-type to supplier-group

* update supplier-group doc, update pngs
 2018-06-07 16:47:30 +05:30
Zarrar
209d8f36f7 doctype was not reloaded to pickup changes (#14371) 2018-06-07 16:43:55 +05:30
Prateeksha Singh
50ae6b891b
Merge pull request #14410 from pratu16x7/hub-fixes 
Hub fixes
 2018-06-07 14:19:01 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav 
Some more travis fixes
 2018-06-07 14:14:33 +05:30
Prateeksha Singh
00ab78d768 [hub] set page title dynamically 2018-06-07 14:13:00 +05:30
Shreya
88591314b0 Fix Leave Application test cases 2018-06-07 13:56:27 +05:30
Rohit Waghchaure
de82ad1c5f [Fix] Clenaup code if supplier gstin is none 2018-06-07 13:24:25 +05:30
Prateeksha Singh
9a7f957ace [hub] fix item page recursion 2018-06-07 12:40:40 +05:30
Shreya
88fe0d59d9 Fix daily work summary test 2018-06-07 11:22:26 +05:30
Shreya
4638d1ab97 Fix POS Profile test 2018-06-06 16:23:16 +05:30
Shreya
71316aaec8 Modify asset movement test cases and files 2018-06-06 15:55:30 +05:30
Zarrar
32a118d68c fix precision in stock entry (#14366) 2018-06-06 15:06:52 +05:30
Saurabh
eb579a11e1 Fix demo (#14365) 
* fix demo

* Update asset.json
 2018-06-06 15:05:31 +05:30
Shreya
90bdfed3db Modify all asset test cases 2018-06-06 14:27:55 +05:30
Manas Solanki
3504a2342e
PR to check the current state of Travis 2018-06-06 12:46:06 +05:30
Ranjith Kurungadam
cff14793d8 Salary Structure, Slip - make fields readonly (#14358) 
* Salary Structure, Slip - make fields readonly

* codacy fixes

* Salary Component - reorder fields, removed is_group for flexi

* Update salary_structure.js
 2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Ameya Shenoy
36cd433999 bumped to version 10.1.37 2018-06-06 05:41:37 +00:00
Charles-Henri Decultot
a774f3d7a0 POS closing voucher (#14270) 
* POS closing voucher

* Codacy corrections + improvements

* Codacy corrections

* POS Closing Voucher improvements
 2018-06-06 10:22:13 +05:30
Alchez
eb0ac37587 Fix ISO standard references in Agriculture (#14361) 2018-06-06 10:10:56 +05:30
Shreya Shah
59af3a0296 [Enhancement] UOM Conversion Factors (#13853) 
* new doctype UOM category

* new doctype UOM Conversion Factor

* bootstrap json data for uom conversions

* uom conversion in item

* Patch to add all conversions and categories

* Fetch conversions multi-way

* fix codacy

* Rebase with develop

* [minor] Fix

* Add a test case

* Improvise as per review comment

* Add json data for UOMs

* Commonify function and call from patch

* Update uom_conversion_data.py
 2018-06-06 09:44:46 +05:30
Sushant Nadkar
d458f7710f [UX Improvement] Removed uri encoding from search results on front end (#14266) 
* removed uri encoding from search results on front end

* decode search string using html2text
 2018-06-06 09:23:38 +05:30
Shreya Shah
c37fd050c5 Remove unnecessary variable (#14352) 
* Remove unnecessary variable

* Replace cur_frm with frm

* Update material_request.js
 2018-06-06 09:19:48 +05:30
Shreya
9aa7d8fe5f Update asset related test cases 2018-06-06 04:27:59 +05:30
Shreya
80a1e156cb Create location for asset test 2018-06-06 03:11:18 +05:30
Shreya
9c801b976d Fix share transfer test 2018-06-06 02:58:23 +05:30
Shreya
8f692f9a27 Fix batch test 2018-06-06 02:09:17 +05:30
Shreya
2ad81726d5 Fix utils.py 2018-06-06 02:09:17 +05:30
Manas Solanki
dabe21051c Update test_company.py (#14360) 2018-06-05 16:28:27 +05:30
Nabin Hait
2f273e73b2 minor fixes 2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop 2018-06-05 14:21:57 +05:30
Shreya Shah
6ff3a094e2 Fix currency exchange tests (#14356) 2018-06-05 14:16:10 +05:30
rohitwaghchaure
50d8c4a10f [Fix] Not able to save purchase invoice, due to invalid condition (#14355) 2018-06-05 13:08:10 +05:30
rohitwaghchaure
2da6b3d628 [enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296) 2018-06-05 13:06:52 +05:30
Shreya Shah
630721aacc Travis (#14354) 
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
 2018-06-05 12:56:10 +05:30
Nabin Hait
81d12cc9c8 Get default income account from Item 2018-06-05 12:49:03 +05:30
Ranjith Kurungadam
d580c92377 Staffing Plan (#14346) 
* validate staffing plan

* staffing plan docs

* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set

* validate with parent and child company plans, plan now considers open job openings

* Failure details in validate error messages

* Fixed sql injection
 2018-06-05 11:40:58 +05:30
Shreya Shah
4fa600a8dd Apply GST based on Origin and Place of supply GST Code (#14288) 
* Add new gst field in Taxes and Charges template - is_inter_state

* Add a patch

* Add a regional function to fetch taxes on the basis of GSTin

* Add regional function to hooks.py

* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN

* Fixes in the setup.py for India region

* Set is_inter_state field

For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.

* Fix as per review comment
 2018-06-05 11:27:53 +05:30
Shreya Shah
5103454642 New Report Address and Contacts (#14307) 
* New Report Address and Contacts

* Fix codacy

* Add links to report in module pages
 2018-06-05 10:44:36 +05:30
Sushant Nadkar
565bf203e5 [Improvement] Added display settings for item price, availibility and stock levels (#14308) 
* display item price on website even when cart is disabled

* added display settings for item price, availibility and stock levels

* Update shopping_cart_settings.json
 2018-06-05 10:43:11 +05:30
Alchez
31ab64822c Make the item UOM more visible (#14315) 2018-06-05 10:35:55 +05:30
Shreya Shah
f1e54836cb Remove hardcoded workflow patches (#14340) 2018-06-05 10:35:07 +05:30
Shreya Shah
b75e77a2cc Fix syntax (#14342) 2018-06-05 10:33:29 +05:30
Sushant Nadkar
64907e5083 Validate response message for frappe call (#14343) 2018-06-05 10:33:04 +05:30
Zarrar
7c088ff623 dont validate items if item_code not found (#14344) 
item_code field is not set when created using invoice creation tool
 2018-06-05 10:32:09 +05:30
rohitwaghchaure
7cf01e7c75 Replaced fixer api with exchangeratesapi (#14347) 2018-06-05 10:30:20 +05:30
asbasawaraj
1b16b772ab Report to Track Expiring Memberships - Monthwise (#14207) 2018-06-05 10:30:03 +05:30
Nabin Hait
c4eec99bc4 minor fix 2018-06-05 09:06:30 +05:30
Prateeksha Singh
2141bfab89 [patch][update] naming_series field in member patch 2018-06-04 16:36:12 +05:30
Rohan Bansal
841d54c49d Start adding tests for contracts 2018-06-04 15:56:38 +05:30
Rohan Bansal
bf0f0aaf6f Add Contract-related doctypes to ERPNext 2018-06-04 15:56:38 +05:30
Prateeksha Singh
37678d4838 [patch][new] rename old members as per naming series (#14339) 2018-06-04 14:25:51 +05:30
Sushant Nadkar
ebf76163ad show uom in list view of material request (#14338) 2018-06-04 14:23:25 +05:30
Ranjith Kurungadam
f576c570c9 Salary Slip - fix when no pyroll period found for tax calc (#14335) 2018-06-04 12:53:23 +05:30
Zarrar
fc03a0463c [Fix] Validate items for saleable, purchaseable or subcontractable in transactions (#14316) 
* validate items to see if they are saleable

* check if items are subcontractable or saleable

* improvise name,error message and code
Validate type function validates item if they are of proper type for that transaction and throws descriptive error.
 2018-06-04 12:52:52 +05:30
Nabin Hait
8c7af497a0 Fixed merge conflict 2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2 Salary Slip - Deduct Tax (#14255) 
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof

* fix - missing return statement
 2018-06-04 11:17:55 +05:30
Nabin Hait
a55090dc88 Fixed merge conflict 2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d Rename - Additional Salary Component to Additional Salary (#14302) 
* Rename Doctype Additional Salary Component to Additional Salary

* Remove unused import
 2018-06-04 11:02:53 +05:30
rohitwaghchaure
5ecc26bf15 [Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328) 2018-06-04 11:00:24 +05:30
Prateeksha Singh
8ac7dfee36
Merge pull request #14329 from pratu16x7/hub-fixes 
[hub][minor] remove links #14309
 2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863 [hub][minor] remove links #14309 2018-06-04 10:26:49 +05:30
rohitwaghchaure
c1cf495a93 [Fix] Special character issue (#14322) 2018-06-03 16:00:31 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json 2018-06-03 15:31:35 +05:30
Shreya Shah
d3255b1d3d Add docs for Inter Company Invoice creation (#14314) 2018-06-03 10:28:51 +05:30
Tropicalrambler
8b38e57af2 Correcting typo in the User Documentation (#14326) 
This corrects a simple typo in the Pricing rule topic for documentation
 2018-06-03 10:27:38 +05:30
Ranjith Kurungadam
375db6181d Earned Leave (#14143) 
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this

* Earned Leave monthly scheduler method, test

* remove whitelist of method
 2018-06-01 16:09:28 +05:30
rohitwaghchaure
ce642d73cb [Fix] Special character issue while upadting customer group in customer (#14312) 2018-06-01 15:11:21 +05:30
rohitwaghchaure
2fa057e4ad [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) 2018-06-01 15:10:55 +05:30
Zarrar
7e0e85912b item_name not fetched in packing slip (#14310) 2018-06-01 15:10:33 +05:30
Saurabh
824e068d0a typo fix 2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
Saurabh
fccf7f2a68 bumped to version 10.1.36 2018-05-31 17:54:53 +06:00
Ranjith
590bf4ce3a codacy fixes 2018-05-31 12:08:14 +05:30
Shreya Shah
c55f774fbf Address filter in gstr1 report (#14290) 2018-05-31 09:33:36 +05:30
AMS Fauzi
f3a6d95634 Develop: Batch Number Series (#14251) 2018-05-31 09:31:57 +05:30
rohitwaghchaure
780952ea03 Show actual qty in warehouse link search (#14258) 2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman
f12b446dc8 Bank Account #13714 PR (#14295) 2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495 [minor][fix] fix query syntax (#14294) 
* [minor][fix] fix query syntax

* Update pos.py
 2018-05-31 08:54:31 +05:30
Umair Sayed
5225c0e541 May docs (#14298) 
* manual update

* Added new videos in learn section. Updated other help pages.

* project module rewrite

* employee and supplier master

* employee and supplier master fixes
 2018-05-31 08:43:22 +05:30
rohitwaghchaure
26833cf506
Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget 
Rearrange fields
 2018-05-31 00:27:45 +05:30
Rohit Waghchaure
7c0dd7a142 Rearrange fields 2018-05-31 00:27:05 +05:30
Ranjith
0cb2684130 Tax Exemption Proof Submission - validations, eligible hra calc 2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa Tax Exemption Declaration - update fields, move generic methods to utils 2018-05-30 20:50:48 +05:30
rohitwaghchaure
31a96d2a3f [Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287) 2018-05-30 18:13:47 +05:30
Prateeksha Singh
c62de0831e
Merge pull request #14291 from pratu16x7/help-page 
[fix] help page issue listing
 2018-05-30 17:27:49 +05:30
Prateeksha Singh
66425c6e7f [fix] help page issue listing 2018-05-30 17:26:03 +05:30
Shreya Shah
47335e5e60 Stocking out items with expired batches (#14249) 
* Add dropdown in Stock Entry to get expired batch items

* Fetch all the items with expired batches

* Add the fetched item details to stock entry details

* Modify as per the review comments
 2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b [Enhance] Provision to set overproduction percentage for work order (#14248) 2018-05-30 15:28:09 +05:30
Prateeksha Singh
09e46a4e5f Hub fixes (#14281) 
* [hub] remove list freeze

* [hub] fix svg in icon

* [hub] implement route options in hub list view
 2018-05-30 15:12:20 +05:30
Jignesh Greycube
9aca025be2 Documentation to Fetch value in Child Table for a field (#14282) 
* Fetch value in Child Table for a field

Sample Script to fetch value in child table

* Update fetch value in child table field
 2018-05-30 15:08:55 +05:30
Ranjith
806cd93791 Merge remote-tracking branch 'frappe/develop' into dev_hra 2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e
Merge pull request #14267 from surajshetty3416/workflow-doc-changes 
Add doc related to workflow action
 2018-05-30 12:34:21 +05:30
Zarrar
39c0add5a2 query fix sales-person-target-variance-item-group-wise (#14271) 2018-05-30 11:56:58 +05:30
Zarrar
58200182b4 update timeline data form Activity Log (#14276) 
Documents updated are stored in Activity Log rather than Communication
 2018-05-30 11:56:23 +05:30
Prateeksha Singh
865e16621c [docs] fix embed issues (#14268) 2018-05-29 17:09:56 +05:30
Suraj Shetty
e51e51e138 Add requested changes 2018-05-29 16:46:19 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Suraj Shetty
77aed9d58b Move video section to bottom 2018-05-29 15:45:22 +05:30
Suraj Shetty
16d3494efc Add doc related to workflow action 2018-05-29 15:29:18 +05:30
Vladyslav Baidak
13d4391e70 Fixed SQL syntax error in Get Loan Details (#14265) 2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf Tax Exemption Declaration, Proof Submission HRA fields 2018-05-29 13:58:31 +05:30
Ranjith
fb257ba19c Company - Payroll Settings- fields 2018-05-29 13:57:27 +05:30
Nabin Hait
4d0c73a5c8 Submit auto created salary structure assignments 2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b [fix] add ignore validate flag (#14238) 2018-05-29 13:07:27 +05:30
Nabin Hait
288cbcafce Create demo data for salary structure 2018-05-29 11:04:11 +05:30
Nabin Hait
153536bf70 minor test fixes 2018-05-29 10:58:57 +05:30
Shreya Shah
ae95a8aa15 Update status in Purchase Receipt (#14257) 
* Update status on submission if per_billed = 100

* Add patch to update existing records
 2018-05-28 18:24:28 +05:30
Zarrar
b9f54ca946 [Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250) 
* add doctypes allowed to group items, average the rate

* add check field to group items during print

* call common before_print in delivery note

* fix precision issue while calculating average
 2018-05-28 17:41:09 +05:30
rohitwaghchaure
a8c6ec27c0
Merge pull request #14252 from rohitwaghchaure/leaderboard_translation_issue 
[Fix] Translation issue in leaderboard
 2018-05-28 15:51:00 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix 
[fix] Stock Ledger report item filter
 2018-05-28 15:23:21 +05:30
rohitwaghchaure
bd2989a541
Merge pull request #14254 from rohitwaghchaure/leave_application_issue_for_leave_approver 
[Fix] Leave application, leave approver not fetching
 2018-05-28 15:11:08 +05:30
Rohit Waghchaure
81302a8b12 [Fix] Leave application, leave approver not fetching 2018-05-28 15:10:19 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue 
[Fix] Data not displaying in financial reports
 2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e Fixed data not displaying in financial reports 2018-05-28 15:01:57 +05:30
Rohit Waghchaure
06f91e2dc1 [Fix] Translation issue in leaderboard 2018-05-28 14:43:17 +05:30
rohitwaghchaure
30c88fe1a5
Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse 
Fixed patch, checked warehouse available in the asset
 2018-05-28 12:30:55 +05:30
Rohit Waghchaure
ad184f62e3 Fixed patch, checked warehouse available in the asset 2018-05-28 12:29:42 +05:30
Shreya Shah
13f39eb821 Display rate on the basis of stock UOM (#14246) 2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114) 
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
 2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b Sales Payment Summart Report Improvement (#14243) 
* fix iteritems() takes exactly 1 argument (2 given)

* adds new helper functions

* use new functions to make POS invoices filterable on warehouse and cost center

* more PEP8 fixes
 2018-05-28 10:26:45 +05:30
Kenneth Sequeira
119cc5dec6 Documentation - Open Divs and Video Resolutions (#14242) 
* fixed open div tag in edu docs

* fixed open div tag in projects page

* fixed open div for item variants, serialized inventory article

* fixed video aspect ratio and open div for Selling, Workflow, and Material Request
 2018-05-28 10:24:43 +05:30
Ameya Shenoy
67c9566e77 Duct tape for demo (#14241) 
The demo is just too old and needs a complete refactor. This is just a
workaroud to keep the demo working
 2018-05-27 12:45:32 +05:30
Solufyin
64d02f917a [ADD] Department Analytics Bar Chart Feature (#14217) 2018-05-26 09:26:03 +05:30
rohitwaghchaure
a8fb2db001 [Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230) 2018-05-26 09:23:02 +05:30
Kenneth Sequeira
089a41c679 Fixed code in Embed Link (#14228) 2018-05-26 09:22:43 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493 Minor fixes (#14231) 
* Parse date using getdate to avoid TypeError

* Fix alignment of application dashboard table text

* Use `user` instead of `email` to get value from user table
 2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c Remove unused imports 2018-05-25 15:20:50 +05:30
Jamsheer
9416ac4ad4 Leave Priod - fix - grant leave allocation filter by grade 2018-05-25 14:46:31 +05:30
Manas Solanki
730cb3b547
Update employee.py 2018-05-25 14:46:21 +05:30
Jamsheer
fca88a6b22 Employee benefits - get_assigned_salary_structure 2018-05-25 14:35:02 +05:30
Jamsheer
79a6b42353 Salary Slip - options to fetch from migration 2018-05-25 12:56:22 +05:30
Jamsheer
ce89199abb taxable salary slabs remove from Salary Component and add to Payroll Period 2018-05-25 12:52:23 +05:30
Jamsheer
f1d10bf286 Salary Component - remove flexi_default 2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c Employee Benefit Claim - non pro-rata claim validation updated 2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d options to fetch from migration 2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a Employee Benefits in Salary Slip - Application and Claim 2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e get payroll period days - fix 2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0 Calculate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516 Validate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3 Employee Benefit Claim - date default to Today 2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec Max benefit amount in Employee Benefit Application Detail 2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02 Employee Benefit Calim - earning component filter updated 2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e Employee Benefit Application - refactor validation 2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f Salary Structure - validate flexi with max benefit 2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68 Payroll Period - validate dates and overlap 2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499 Payroll Period - fields refactor 2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21 Salary Structure - validate max benefits with flexi 2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e Salary Structure - filter for earnings 2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c Employee Benefit Application - earning component filter by salary structure flexi component 2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01 Salary Component - account mandatory for separate payment entry 2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752 Codacy fix 2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c Additional Salary Component - filter updated - salary_component 2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af Salary Component - fields - refactor fields behaviour 2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7 Employee Benefit Application - filter updated - earning component 2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb Employee Benefit Claim - filter for earning component 2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005 Employee Benefit Claim - Validation Updated - Code refactor 2018-05-25 12:37:35 +05:30
Nabin Hait
f87ec61043 Test case fixes for item defaults 2018-05-24 18:19:21 +05:30
Ranjith Kurungadam
27cf190269 healthcare fix - str encode to utf-8 (#14213) 2018-05-24 17:15:22 +05:30
Nabin Hait
b903fc4e71 Item defaults query fixes 2018-05-24 17:07:51 +05:30
Prateeksha Singh
05283b8af0
[fix] distribution page embed 2018-05-24 16:17:22 +05:30
Zarrar
ea064d4c5c module import fix in patch (#14203) 2018-05-24 15:54:48 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop 2018-05-24 08:45:14 +00:00
Ameya Shenoy
475729cefe bumped to version 10.1.35 2018-05-24 08:45:12 +00:00
neckos
7663bb91c5 return list(filter()) not filter() (#14191) 
filter constructs an iterator that is iterable only once
 2018-05-23 19:45:34 +05:30
neckos
225af4a4cb unicode error in python3 (#14192) 2018-05-23 19:43:53 +05:30
Manas Solanki
f7713ebfa7 [optimize] introduce two filter in the report in order to handle large item master data (#14193) 2018-05-23 19:43:04 +05:30
Nabin Hait
5f861756a2 Item Default fixes 2018-05-23 19:37:06 +05:30
Nabin Hait
d5cb4c10a1 Set parent department if missing and not root itself 2018-05-23 18:36:18 +05:30
Rushabh Mehta
315dbd2ed1 [minor] chart_of_accounts.py for python3 2018-05-23 16:14:35 +05:30
Rushabh Mehta
f7414519bb [fix] set default supplier group in test 2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431 [fix] inconsistent indentation 2018-05-23 16:14:35 +05:30
Nabin Hait
46600406b8
Update rename_field_max_days_allowed.py 2018-05-23 13:12:24 +05:30
Achilles Rasquinha
efb731941d ran 2to3, evaluation (#13499) 
* ran 2to3, evaluation

* Update update_gstin.py

* Update accounts_receivable_summary.py
 2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121) 
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
 2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1 Link Share Transfer to Account (#14127) 
* Link Share Transfer to Account

* minor changes

* minoor changes
 2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10 Project Budget does not filter per Project (#14179) 
* Project Budget does not filter per Project

Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.

* Update budget.py
 2018-05-23 10:47:53 +05:30
Prateeksha Singh
2f69254e56 [company][dashboard] implement heatmap with linked doctypes (#14185) 
* [company][dashboard] implement heatmap with linked doctypes

* [company][dashboard] cache transaction history data, schedule query daily
 2018-05-23 10:41:26 +05:30
Suraj Shetty
e03937fd6a Send daily work summary alert to only enabled users (#14175) 
* Send daily work summary alert to only enabled users

* Fix import
 2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274 Rename occurences of max_days_allowed to max_continuous allowed (#14180) 2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3
Merge pull request #14160 from shreyashah115/patches-fixes-travis 
Fix patches for Travis
 2018-05-22 15:26:49 +05:30
Faris Ansari
7a5221bd95
Add rename_field 2018-05-22 15:26:21 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Ameya Shenoy
826f020862 bumped to version 10.1.34 2018-05-22 09:06:38 +00:00
Prateeksha Singh
b44ea4c8dc [website] Support Portal (#14144) 
* [init] support portal

* [support-portal] Get started sections and forum activity

* [support-portal] integrate API search for forums, docs, etc

* [support-portal] integrate doctype docs search via global search

* [support-portal] /help page UI
 2018-05-22 11:57:21 +05:30
Rohit Waghchaure
7529bbb7b4 [Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference' 2018-05-22 11:55:48 +05:30
Zarrar
93a186aa11 fetch customer_gstin or billing_address_gstin optionally (#14075) 2018-05-22 09:16:42 +05:30
rohitwaghchaure
742d3e5549 [Fix] General ledger default_currency issue for member party type (#14172) 2018-05-22 09:10:01 +05:30
mnatalia
5f0e8d6e09 Added possibility to translate (#14173) 2018-05-22 09:08:50 +05:30
Rohit Waghchaure
8e12a59d9b [Fix] Patch 2018-05-21 18:52:07 +05:30
rohitwaghchaure
3ec43966da
Merge pull request #14170 from codingCoffee/sal 
salary structure patch run if active employee
 2018-05-21 18:39:10 +05:30
Ameya Shenoy
a7d402132f salary structure patch run if active employee 2018-05-21 18:38:18 +05:30
Prateeksha Singh
bcbe32ce7c
Merge pull request #14169 from pratu16x7/hotfix 
[hotfix][charts] update, without new build system
 2018-05-21 18:31:39 +05:30
Prateeksha Singh
b434f2687e [charts] update, without new build system 2018-05-21 18:04:50 +05:30
Manas Solanki
a96421279d
Remove the debugger from the material_request.js 2018-05-21 17:27:01 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget 
[Fix] Patch, default cost center, expense account for the item
 2018-05-21 17:18:58 +05:30
Faris Ansari
d2b4ec5044 [fix] Set null values to '0' before changing column type 2018-05-21 16:55:31 +05:30
Zlash65
004bf218a0 remove changes for max_days_allowed patch 2018-05-21 16:52:08 +05:30
Rohit Waghchaure
0ca7ba3247 [Fix] Patch, default cost center, expense account for the item 2018-05-21 16:43:50 +05:30
Faris Ansari
e479057148
Merge pull request #14165 from codingCoffee/min 
relieving_date wasnt of type datetime
 2018-05-21 16:42:41 +05:30
Ameya Shenoy
35984daf72 relieving_date wasnt of type datetime 2018-05-21 16:37:27 +05:30
Manas Solanki
a752eca82c
Merge pull request #14163 from manassolanki/fix-20 
[fix] don't update the modified of item price while updating item
 2018-05-21 16:37:01 +05:30
rohitwaghchaure
22619a8e0c
Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue 
[Fix] Unknown column 'i.stock_uom' in 'field list'
 2018-05-21 16:22:23 +05:30
Rohit Waghchaure
abc6cf0aa5 [Fix] Unknown column 'i.stock_uom' in 'field list' 2018-05-21 16:18:37 +05:30
Manas Solanki
b5d9b38dee don't update the modified of the item price 2018-05-21 15:40:51 +05:30
Rohit Waghchaure
11e2a9ac90 [Fix] Permission issue while saving leave application 2018-05-21 15:39:38 +05:30
Zlash65
41cb6cc491 patch fix - skip query if no when_then case 2018-05-21 15:10:06 +05:30
Shreya
70f9d07df8 Fix patches for Travis 2018-05-21 15:04:13 +05:30
Faris Ansari
6d2dfac44e [fix][patch] Shopify (#14159) 2018-05-21 14:41:11 +05:30