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

15294 Commits

Author SHA1 Message Date
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
rohitwaghchaure
1275ea5123
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver 
Set leave approver in the leave application
 2018-05-21 11:58:41 +05:30
Nabin Hait
19ce904030 Report added in Selling module 2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88 customers without any sales transactions 2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818 2018-05-21 10:47:40 +05:30
Valmik
bfb8a73377 Append company after (#14119) 2018-05-21 10:44:35 +05:30
asbasawaraj
5f6b44e142 Formatted chapter member display (#14128) 2018-05-21 10:31:45 +05:30
Shridhar Patil
4c790488ea job opening designation made mandatory (#14153) 2018-05-21 10:30:17 +05:30
Valmik
c28378f448 [fix] get barcode string instead of dict (#14139) 
* [fix] get barcode string instead of dict

* Update pos.py
 2018-05-21 10:06:05 +05:30
Rohit Waghchaure
812224e56e Set leave approver in the leave application 2018-05-20 21:21:33 +05:30
Manas Solanki
f87762887a fetch defualt supplier from the item table (#14113) 2018-05-20 10:58:26 +05:30
Zarrar
42231df33a [Minor] Supplier Group test fix & default supplier in item fix (#14150) 
* fix supplier group test

* item - default_supplier fix
 2018-05-20 10:46:10 +05:30
Zarrar
1f3f18534b [Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149) 
* move set_query to setup function

* rectify leave balance report according to deparmtent changes
 2018-05-20 10:45:14 +05:30
Gaurav Naik
8f17281011 Initialized dynamic link on Warehouse (#14135) 
* Initialized dynamic link for Warehouse

* Codacy Fixes
 2018-05-20 10:39:14 +05:30
rohitwaghchaure
d08ac1fe79
Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11 
Fixes in material request, asset maintenance
 2018-05-18 16:39:48 +05:30
Rohit Waghchaure
73a99441ca Fixed get_query for default data in item 2018-05-18 16:39:08 +05:30
Rohit Waghchaure
6cdaa6e861 Fixes in material request, asset maintenance 2018-05-18 16:30:14 +05:30
Manas Solanki
d976c04b69
Merge pull request #14134 from manassolanki/fix-salary-patch 
[fix] patch for the salary structure assignment for old employees
 2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8 [fix] patch for the salary structure assignment for old employees 2018-05-18 15:46:35 +05:30
rohitwaghchaure
7d834b946f
Merge pull request #14117 from shreyashah115/fixes 
Fix patch
 2018-05-18 12:45:06 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +05:30
Prateeksha Singh
984a7a7e61 [item-query] change order of description terms, name first 2018-05-17 17:29:36 +05:30
Shreya
65dd1f6b4c Mark attendance only if to_date <= nowdate in Leave Application 2018-05-17 17:13:56 +05:30
Basawaraj
6d334b8135 Added Report : Customers Without Any Sales Transactions 2018-05-17 16:54:03 +05:30
Shreya
362e0a9f6e Fix patch 2018-05-17 15:43:03 +05:30
Rohit Waghchaure
f2ccde0454 [Fix] Heatmap issue in the project 2018-05-17 15:40:32 +05:30
rohitwaghchaure
8c6b7557db
Merge branch 'develop' into jam_enterprise_emp_benefit 2018-05-17 14:08:06 +05:30
rohitwaghchaure
4444430200
Merge pull request #14108 from ESS-LLP/tax_deduction 
Variable tax deduction
 2018-05-17 13:55:52 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
Faris Ansari
9e4889d756 [fix] Stock Ledger report item filter 
- breaks when Item Code contains % symbol
 2018-05-17 12:18:28 +05:30
rohitwaghchaure
d2f0d08234
Merge pull request #14105 from Zlash65/fix-dept 
[Minor] Typo in Employee Transfer
 2018-05-17 11:23:52 +05:30
Rohit Waghchaure
992fb34c95 [Fix] Asset adjustment issues 2018-05-17 11:22:59 +05:30
Ranjith
fcfb5a3769 Merge remote-tracking branch 'frappe/develop' into develop 2018-05-17 10:07:23 +05:30
Ranjith
58363e6bbd get_payroll_period return name, fix hard coded leave period 2018-05-17 10:00:33 +05:30
Zlash65
e3f7e8b101 typo in frappe.throw in employee_transfer 2018-05-17 01:34:35 +05:30
Rohit Waghchaure
585945e65d Allow to select Asset Received But Not Billed in expense account head 2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty 
[Fix] Validation issue
 2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b [Fix] Validation issue 2018-05-16 23:57:28 +05:30
Rohit Waghchaure
44fda65b1d [Fix] Company mandatory issue 2018-05-16 23:31:09 +05:30
Ranjith
31eeff00f7 merge frappe/develop 2018-05-16 23:24:34 +05:30
Rohit Waghchaure
a91765707a [Fix] TDS issue 2018-05-16 23:13:02 +05:30
Ranjith
b485b1ef80 Salary Slip calc tax, except for flexi benefits 2018-05-16 23:01:40 +05:30
Ranjith
c6b2575a9c fields in salary detail, copy data from salary component on change 2018-05-16 22:59:21 +05:30
rohitwaghchaure
274f890246
Merge pull request #14099 from rohitwaghchaure/fixed_asset_date 
Multiple fixes in asset
 2018-05-16 22:13:15 +05:30
Rohit Waghchaure
e6acd4c57a Multiple fixes in asset 2018-05-16 22:12:39 +05:30
rohitwaghchaure
64e81b436e
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing 
[Fix] Custom buttons not showing
 2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422 [Fix] Cystom buttons not showing 2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue 
[Fix] Gl Enrty issue
 2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2 [Fix] Gl Enrty issue 2018-05-16 21:34:06 +05:30
rohitwaghchaure
513cd189f0
Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11 
[Fix] onload set default employee, leave approver, company
 2018-05-16 19:57:09 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
Jamsheer
8b86d18f73 Remove unused imports 2018-05-16 19:50:30 +05:30
Jamsheer
3434aabc28 Employee Benefit Claim in Salary Slip 2018-05-16 19:50:30 +05:30
Jamsheer
3abae9c1ba Employee Benefit Application - whitlist method get_max_benefits 2018-05-16 19:50:30 +05:30
Jamsheer
3e64297a3d Employee Benefit Application - validate maximun benefit 2018-05-16 19:50:30 +05:30
Jamsheer
3cd0ad4c98 Codacy fixes 2018-05-16 19:50:30 +05:30
Jamsheer
c9287b5b88 Manage grouping of salary component for flexible benefit 2018-05-16 19:50:30 +05:30
Jamsheer
6410022cab minor fixes 2018-05-16 19:49:39 +05:30
Jamsheer
c678d037e7 Salary slip - throw if no default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
5f6e274505 Salary slip - default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
43740a6511 Employee Benefit Application - employee benefit in salary slip 2018-05-16 19:49:39 +05:30
Jamsheer
0bc665c0a5 Salary Copmonent - Default flexible componnent 2018-05-16 19:49:39 +05:30
Jamsheer
15613e46ad Salary Copmonent - Defualt flexible componnent 2018-05-16 19:48:47 +05:30
Jamsheer
d63c39a514 Payroll Period - get payroll period days 2018-05-16 19:47:18 +05:30
Jamsheer
d66fb842c1 Employee Benefit Application - validate max benefit for employee 2018-05-16 19:47:18 +05:30
Jamsheer
2d6901d5dc Employee Benefit Application - validate max benefit amount for component 2018-05-16 19:47:18 +05:30
Jamsheer
9cb2fc2766 Employee Benefit Application - calcluate benefit amount 2018-05-16 19:47:18 +05:30
Jamsheer
d48998bae1 Employee Benefit Application - Calculate benefit amounts 2018-05-16 19:47:18 +05:30
Jamsheer
779f8ebbb3 Employee Benefit Application - get max benefit 2018-05-16 19:47:18 +05:30
Jamsheer
41616de9cc Employee Benefit Application - validate duplicate 2018-05-16 19:47:18 +05:30
Jamsheer
9cd292b187 Employee Benefit Application - filter updated 2018-05-16 19:47:18 +05:30
Jamsheer
4d93d339f7 Employee benefit - filters fro earning component 2018-05-16 19:47:18 +05:30
Ranjith
29e0ed3da1 Exemption Declaration - field total_amount 2018-05-16 19:10:35 +05:30
Manas Solanki
df0ffab16c
Merge pull request #14093 from manassolanki/poc-fixes-1 
[ui] more fields in the list view of assets
 2018-05-16 18:25:37 +05:30
Manas Solanki
f3f1ba37b9 [ui] more fields in the list view of assets 2018-05-16 18:24:35 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual 
[Fix] Asset gl entry not creating for non perpetual
 2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b [Fix] Asset gl entry not creating for non perpetual 2018-05-16 18:20:52 +05:30
Manas Solanki
5b34c00ba6 Added the travel request on the config page 2018-05-16 18:09:43 +05:30
Manas Solanki
fa57cdd86d
Merge pull request #14090 from manassolanki/poc-fixes 
create item default on making of invoice
 2018-05-16 17:46:53 +05:30
Manas Solanki
5b93562ce3 create default on making of invoice 2018-05-16 17:44:51 +05:30
rohitwaghchaure
19a2260ce7
Merge pull request #14089 from shreyashah115/fixes 
[Fix] General Ledger report filters error
 2018-05-16 17:41:19 +05:30
Shreya
63d14cfac8 Instead of throwing error, just return 2018-05-16 17:30:58 +05:30
Shreya
df9516e906 Add Finance Book to route options 2018-05-16 17:30:35 +05:30
Manas Solanki
e3bb1d0e3b more fixes for the item defaults 2018-05-16 17:14:59 +05:30
Manas Solanki
38667ab8da return defaults according to the company 2018-05-16 17:00:05 +05:30
Rohit Waghchaure
b233e9d643 [Fix] Multiple fixes 2018-05-16 16:41:34 +05:30
Manas Solanki
028e2ad246
Merge pull request #14083 from frappe/codingCoffee-patch-3 
spaces to tabs
 2018-05-16 16:25:25 +05:30
rohitwaghchaure
de796266f2
Merge pull request #14084 from shreyashah115/fixes 
[minor] Fix error
 2018-05-16 16:21:14 +05:30
rohitwaghchaure
9c0a87e804
Merge pull request #14082 from manassolanki/item-fixes 
[fixes] fix in the item defaults
 2018-05-16 16:19:39 +05:30
Manas Solanki
e3910fb2a6 [fixes] fix in the item defaults 2018-05-16 16:16:34 +05:30
Shreya
fda15702bc Fix error 2018-05-16 16:14:34 +05:30
Ameya Shenoy
6e92958578
spaces to tabs 2018-05-16 16:11:20 +05:30
Rohit Waghchaure
23942701f1 [Fix] 'PurchaseInvoiceItem' object has no attribute 'company' 2018-05-16 15:41:00 +05:30
Manas Solanki
8e184569a1
Update item.json 2018-05-16 15:11:52 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint 
[fix] calculate withholding only on invoice
 2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd [fix] calculate withholding only on invoice 2018-05-16 15:00:19 +05:30
Manas Solanki
b81ece9ddf
Merge pull request #14076 from chdecultot/pricing_rule 
Missing parentheses in price list rate determination
 2018-05-16 14:55:32 +05:30
Manas Solanki
4534df36a9
Merge pull request #14078 from manassolanki/pos-fix 
[enterprise] minor fixes
 2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220 [enterprise] minor fixes 
make the employee name mandatory in the employee onboarding
added the retention bonus amount
 2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37
Merge pull request #14077 from manassolanki/travel-request 
[rename] Photo ID -> Identification Document
 2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd [rename] Photo ID -> Identification Document 2018-05-16 14:12:22 +05:30
Charles-Henri Decultot
2f822476dd Removal of debugging print 2018-05-16 08:40:16 +00:00
rohitwaghchaure
9ad0ac9557
Merge pull request #14068 from manassolanki/travel-request 
[feature] added travel request doctype in HR
 2018-05-16 14:05:26 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts 
[enhancement] add the item defaults in the child-table for multi-company
 2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868 Missing parentheses in price list rate determination 2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
lasalesi
265005d30d apply sorting for make multiple variant attributes (#14073) 2018-05-16 13:10:25 +05:30
Ranjith Kurungadam
cdd4704485 Fixes, fields in Salary Component (#14071) 
* remove duplicate fields

* Salary Component - fields is_tax_applicable, is_payable

* fix intendation
 2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514 fix for tests 2018-05-16 13:05:13 +05:30
Manas Solanki
64614374d8 fix codacy 2018-05-16 13:00:56 +05:30
Manas Solanki
bbd8508783 optimize the patch 2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e changes for the default cost center 2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
Manas Solanki
c760222a6c add the item defaults in the childtable for multicompany 2018-05-16 12:44:06 +05:30
Rohit Waghchaure
909069fa20 [Fix] 'Supplier' object has no attribute 'on_hold' 2018-05-16 12:25:51 +05:30
Ranjith
4bbf705e58 fix intendation 2018-05-16 12:17:57 +05:30
Ranjith
db120fb0bc Salary Component - fields is_tax_applicable, is_payable 2018-05-16 12:17:16 +05:30
Rohit Waghchaure
144e9b178a Added project condition in budget validation 2018-05-16 12:15:57 +05:30
Ranjith
447f0e495a remove duplicate fields 2018-05-16 12:13:46 +05:30
Rushabh Mehta
b56f3d0689 [fix] syntax errors 2018-05-16 12:03:39 +05:30
Saurabh
d60c0f2292 Refactor shopify (#13588) 
* move shopify settings to ERPNext

* [fix] setup webhook for order and validate webhook request

* validate webhook request

* sync customer and item if not exists while syncing order from shopify

* pull item from shopify and minor fixes

* fix method naming, mechanisim to register and withdraw webhooks, patch

* minor fix

* minor fixes

* [Patch][fix] use remove_from_installed_apps instead of remove app

* log exceptions

* add shopify logging for failed requests

* minor fixes

* fix test case

* codecy fixes

* check shared secret exists

* Test Case fixes

* UX fixes and patch fixes

* Documentation

* fixes

* [fix] dump webhooks request data into doctype

* Provision to resync the order if error occured in sync

* [fix] set default host
 2018-05-16 11:33:47 +05:30
tundebabzy
ad08d4ce96 Ability to hold payment for disputed invoices #12048 (#13298) 
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments

* sanitize `on_hold` field input

* show hold status in list view

* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed

* reset release date if supplier is not on hold

* add validation to stop transactions when Supplier is blocked

* add test cases

* return empty list for outstanding references if supplier is blocked

* block make button:payment if supplier is blocked

* adjust test cases

* PEP 8 clean up

* more tests

* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold

* implement individual purchase invoice on hold logic

* allow user to change release date

* update manual

* final cleanup including more validation and tests

* update supplier manual

* make default for release_date argument todays date

* remove Auto Repeat added by mistake

* add on_hold_field to purchase invoice

* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view

* implement explicit payment hold in purchase invoice

* update manual

* add dialog for saving comment

* bug fix, refactor, clean up

* more test cases
 2018-05-16 11:31:41 +05:30
Shreya Shah
4f40b2dca5 [Fix] Sales Person Reports (#13987) 
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.

* Fix codacy

* Modify as per the review comment
 2018-05-16 11:22:59 +05:30
Shreya Shah
1906cadd94 [Fix] Currency field in Pricing rule (#14004) 
* some minor changes

* Set query for price list based on currency

* Validate Price list with currency
 2018-05-16 11:20:30 +05:30
rohitwaghchaure
557f40465b
Merge pull request #14067 from shreyashah115/fixes 
[minor] Fix typo
 2018-05-16 11:12:11 +05:30
rohitwaghchaure
e48b47fc0c Production Plan, do not consider the sales orders against which work order has been created (#13800) 
* Production Plan, do not consider the sales orders against which work order has been created

* Added test cases
 2018-05-16 11:07:55 +05:30
Shreya
2a1bcf285b [minor] Fix typo 2018-05-16 11:06:02 +05:30
Manas Solanki
d11b5d398d [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Doridel Cahanap
e42192bb6c [WIP] Alternative items (#13705) 
* Alternative Items in BOM

* Alternative Items in Work Order
 2018-05-16 10:58:39 +05:30
Jamsheer
0cde6ae3c5 Clinical procedure (#13540) 
* Clinical Procesdure Template and Clinical Procedure Doctype

* Consultation - Create procedure and procedure prescription

* Patient Appointment - Create Procedure and Procedure appointment invoice

* Physician Schedule - Validate slot overlap

* Clinical Procedure Item - batch_no for Clinical Procedure not for Template

* Clinical Procedure - manage item batch_no

* Codacy - fixes

* Yet another Codacy and travic-ci fix

* Codacy - fixes

* Clinical Procedure - Codacy fix

* Permissions updated

* fixed Qty Indicators, Minor fixes

* Patient appointment for procedure prescription

* Doctype Patient Service Unit to Healthcare Service Unit

* Add healthcare service unit tree root

* Healthcare Service Unit - Tree view script

* Healthcare Service Unit - allow appointments check

* Clinical Procedure - remove unused variable

* Clinical Procedure - Get actual quantity from ledger - fix

* Clinical Procedure - apply transilation for message

* Warehouse in Healthcare Service Unit

* Service Unit in Clinical Procedure

* Codacy fix

* Missing semicolon
 2018-05-16 10:54:00 +05:30
Rushabh Mehta
bc5c04f438
Update job_offer.js 
cur_frm is deprecated
 2018-05-16 10:51:15 +05:30
rohitwaghchaure
915877553a
Merge pull request #14066 from rohitwaghchaure/minor_asset_fix 
[Minor] Is fixed asset checkbox not set at server side if duplicate
 2018-05-16 10:49:52 +05:30
Rohit Waghchaure
a02640e249 [Minor] Is fixed asset checkbox not set at server side if duplicate 2018-05-16 10:49:12 +05:30
Manas Solanki
1b48fde986 Make the communication from the issue webform (#14015) 2018-05-16 10:47:02 +05:30
Frappe PR Bot
b2a64d6344 [Translation] Updated Translations (#14021) 2018-05-16 10:46:11 +05:30
Charles-Henri Decultot
471dea0d10 Digest translation improvement (#14026) 2018-05-16 10:45:03 +05:30
Suraj Shetty
8501010f12 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
 2018-05-16 10:44:38 +05:30
Shreya Shah
11f3e8155b Import nowdate (#14064) 2018-05-16 10:42:09 +05:30
Rohit Waghchaure
d3e84a6944 [Fix] Issue, local variable 'leaves_encashed' referenced before assignment 2018-05-16 09:39:44 +05:30
rohitwaghchaure
4671c53eb0
Merge pull request #14056 from ESS-LLP/retention_bonus 
Retention bonus
 2018-05-15 22:27:04 +05:30
rohitwaghchaure
41b457076d
Merge branch 'develop' into enterprise_fix 2018-05-15 22:26:11 +05:30
rohitwaghchaure
043aae7293
Merge pull request #14058 from ESS-LLP/encashment 
Leave Encashment
 2018-05-15 22:24:52 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po 
[Enhance] Budget validation on material request, purchase order
 2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc [Enhance] Budget validation on material request, purchase order 2018-05-15 22:12:44 +05:30
Ranjith
d43e068a5b fix Leave Encashment unlink additional component, readonly encashed days 2018-05-15 20:11:30 +05:30
Ranjith
c60c6981a5 Merge remote-tracking branch 'frappe/develop' into encash 2018-05-15 20:00:26 +05:30
Jamsheer
3beeb7255f Compensatory Leave Request - add link to leave allocation 2018-05-15 19:42:27 +05:30
Jamsheer
ebb68afecb Leave Allocation - remove link to compensatory leave request 2018-05-15 19:41:25 +05:30
Jamsheer
a46ce11af9 Additional Salary Component - naming and date fix 2018-05-15 19:20:51 +05:30
Ranjith
819c3b1bf6 Retention Bonus - menu, validate 2018-05-15 19:17:31 +05:30
Ranjith
7d394c14ce Email Alert for Retention Bonus 2018-05-15 19:15:58 +05:30
Manas Solanki
70899f5a60
Update utils.py 2018-05-15 18:52:14 +05:30
anoop
bb629de49b doctype retention bonus 2018-05-15 18:41:46 +05:30
Zlash65
b8bd6644fd remove unused module import and error classes 2018-05-15 18:23:41 +05:30
anoop
504855e1a0 on submit: create additional salary component, revert on cancel 2018-05-15 18:11:49 +05:30
rohitwaghchaure
0e47837dab
Merge pull request #14051 from shreyashah115/min-fix 
[Fix] Supplier Doctype
 2018-05-15 17:55:32 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate 
[Enhancement] Buying and Selling checkboxes in Currency Exchange
 2018-05-15 17:55:09 +05:30
Shreya
acc4ceceb7 Add Patch to update existing records 2018-05-15 17:54:10 +05:30
Shreya
da5163da2f Fix Supplier Doctype 2018-05-15 17:43:50 +05:30
Zlash65
36cb8fb153 removed hard coded account_type from tree's add_child entry 2018-05-15 17:36:01 +05:30
Shreya
3f77852e93 Pass buying or selling as filter parameters 
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
 2018-05-15 17:22:06 +05:30
Shreya
b547cdd8fa Add buying or selling to filters in get_exchange_rate 2018-05-15 16:58:45 +05:30
Ranjith
4c721cbe0f Leave Encashment - submit, cancel Additional Salary Component 2018-05-15 16:39:20 +05:30
rohitwaghchaure
c0b15cf41a
Merge pull request #14041 from manassolanki/deferred-account 
Deferred account
 2018-05-15 16:31:05 +05:30
rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix 
[Minor] Fixes for Customer DocType
 2018-05-15 16:30:46 +05:30
Rohit Waghchaure
e0b515066e [Fix] Employee mandatory validation issue 2018-05-15 16:18:05 +05:30
Shreya
8e386167b8 Set Mandatory from client-side 2018-05-15 16:09:53 +05:30
Rohit Waghchaure
e2a7f86636 Navigation added for Employee Separation, Onboarding 2018-05-15 16:04:39 +05:30
Shreya
f636503dc1 [minor] Fix customer doctype 2018-05-15 15:57:27 +05:30
rohitwaghchaure
6bcf48a70e
Merge pull request #14043 from Zlash65/fix-dept 
[Minor] Remove duplicate from HR config file
 2018-05-15 15:28:16 +05:30
rohitwaghchaure
66ece67d41
Merge pull request #14044 from shreyashah115/fix-promotion-doc 
[Fix] Updation of new values in Employee Property History
 2018-05-15 15:27:16 +05:30
Manas Solanki
2f4e5ee2c2
Update hooks.py 2018-05-15 15:25:14 +05:30
Zlash65
44146e0cda remove duplicates 2018-05-15 15:21:49 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account 2018-05-15 15:20:44 +05:30
Shreya
14069c9395 Fix updation of new values 
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
 2018-05-15 15:19:24 +05:30
Saurabh
ac2692711b Merge branch 'master' into develop 2018-05-15 14:59:38 +05:30
Saurabh
78a0be666f bumped to version 10.1.33 2018-05-15 15:29:36 +06:00
Saurabh
29160441bb [fix] if UOM and Warehouse link is invalid then set blank values 2018-05-15 14:56:18 +05:30
Manas Solanki
183dc731c2
Update employee_onboarding.py 2018-05-15 14:32:37 +05:30
Zlash65
7f5ebbe494 call post company fixture after setting up company 2018-05-15 13:53:40 +05:30
Zlash65
667f846bdb bifurcate data into pre & post company fixtures 2018-05-15 13:53:40 +05:30
Zlash65
99e72af089 skip abbr, reload doc, disable edit for root department node' 2018-05-15 13:53:40 +05:30
Manas Solanki
0b7f64924d booking via the schedular 2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60 deferred account in the item and company master 2018-05-15 13:04:01 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Saurabh
f8c26bb778 bumped to version 10.1.32 2018-05-15 13:28:15 +06:00
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
Rohit Waghchaure
4a126947f5 Code cleaup 2018-05-15 12:43:21 +05:30
anoop
6119b7337c updated get_leave_balance_on to consider encashed leaves by default. 2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f 13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending 2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b helper method to get employees assigned salary structure 2018-05-15 12:36:42 +05:30
anoop
161b3b2979 added field Total Leaves Encashed 2018-05-15 12:35:51 +05:30
anoop
067b5574ce duplicate field is_encash removed, fixed in install fixtures 2018-05-15 12:27:23 +05:30
Saurabh
ccd0617e19
Merge pull request #14017 from netchampfaris/apply-price-list-hotfix 
[fix] apply price list
 2018-05-15 11:25:08 +05:30
Saurabh
12f708d155
Merge pull request #14035 from saurabh6790/v11_patch_fix 
[fix] reload Leave Period and Staffing Plan doctypes
 2018-05-15 10:49:53 +05:30
Rohit Waghchaure
3f02820384 [Fix] Global name 'Approved' is not defined 2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45 [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
Shreya
dbb67fb4fd Clear leave balance on changing leave type 2018-05-14 23:02:09 +05:30
Saurabh
99400bd958 remove duplicate fields occured due to merge conflicts 2018-05-14 22:11:17 +05:30
Rohit Waghchaure
9ba72f7897 [Fix] get_approved_leaves_for_period module import failed 2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint 2018-05-14 20:57:40 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption 2018-05-14 20:47:35 +05:30
Saurabh
4ae089d6a1 Provision to deduct TDS on Advance 2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18 tds fixed for PI 2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec calculate TDS on Sales Invoice Amount 2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0 Supplier Tax Withholding Config 2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f Bootstrap 'TDS' via fixture 2018-05-14 20:41:38 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding 
[feature] added the employee onboarding and separation doctype
 2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0 minor changes and fixed the conflicts 2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period 
Accounting Period
 2018-05-14 20:33:09 +05:30
rohitwaghchaure
3282191aae
Merge pull request #14025 from shreyashah115/html-table 
Show pending leaves as an HTML table in leave application
 2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
rohitwaghchaure
48199842aa
Merge pull request #13750 from rohitwaghchaure/asset_purchase_link 
Asset linked to purchase and serial no
 2018-05-14 20:24:37 +05:30
rohitwaghchaure
8d626e6888
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp 
Additional Salary Component
 2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11 Make Available Leave HTML Table 2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022 Fix - missing semicolon 2018-05-14 19:17:16 +05:30
Rohit Waghchaure
d644e6da16 Code cleanup 2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4 Patch to move asset fields to Asset Finance Book table 2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976 Patch to make location 2018-05-14 19:08:56 +05:30
Rohit Waghchaure
16bc853f6a Reschedule for future depreciations and booked difference amount in accumulated depreciation account 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
aa7b434270 Create asset adjustment doctype, post gl entry for the asset 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
0ea6fe4397 Added new doctype Finance Book Detail in asset, asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a Commonify get_asset_category_account and get_fixed_asset_account method 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba Treeview for Location 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418 Asset accounting 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
Jamsheer
47039e801e Remove unused import 2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428 Remove unused variable 2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number 
Cost center number
 2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd Attendance Request - half day check is enabled 2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop 
Bank Statement Import
 2018-05-14 18:27:53 +05:30
Gaurav Naik
21b2df41ac [Fix] len() instead of .length 2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a [WIP] Accounting Period Test cases 2018-05-14 18:11:09 +05:30
Jamsheer
ead858b4de Compensatory Leave Request - fix 2018-05-14 18:08:31 +05:30
Gaurav Naik
52571a80da Bootstrap documents for closing (js) 2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5 Bootstrap documents for closing 2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c [Fix] Indentation for accounting_period overlap 2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592 Compensatory Leave Request - leave allocation create and update - fix 2018-05-14 17:56:22 +05:30
Zlash65
06fd51bf69 patch fix for instructor 2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b create and update department records patch 2018-05-14 16:07:28 +05:30
Zlash65
03ad0f2f4a set query for department based on company 2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7 set department name with company abbr 2018-05-14 16:07:27 +05:30
Zlash65
39668609ce improv department tree 2018-05-14 16:07:27 +05:30
Zlash65
366ca92ba7 move default_currency on top 2018-05-14 16:07:27 +05:30
Zlash65
513f13df27 patch fix 2018-05-14 16:05:16 +05:30
Faris Ansari
404f39d373 [fix] apply price list 
in_apply_price_list flag remains true if server exception occurs
 2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe codacy fix 2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4 [Enhancement] Monthly Attendance Report (#13970) 
* Update Attendance on Approval of Leave

* Separate out leaves on the basis of its type

* Remove commented code

* Make attendance records if not found

* Fix Codacy

* Replace bad code in attendance.py
 2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5 [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc button triggers not working in tasks table (#13973) 2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10 [fix] Incorrect currency conversion in Itemised Tax Breakup (#14006) 2018-05-14 14:19:31 +05:30
Suraj Shetty
f93cc57e8a Ignore user permission for 'variant Of' in Item (#14013) 
- Since mostly variant of is null it gets filtered out if
user permission is applied.
And since variant is a link to item itself there is no need to check
user permission for it as user permission gets applied on Item anyways.
 2018-05-14 14:07:20 +05:30
Shreya Shah
ba6cb8ae4b [Healthcare] Fix UI (#14011) 
* Fix UI

* Fix Calendar View
 2018-05-14 14:06:31 +05:30
Faris Ansari
a7387b45ec [fix] Get items from BOM error in python 3 (#14012) 2018-05-14 14:05:52 +05:30
Jamsheer
236be22648 Payroll entry - get employee fix 2018-05-14 13:32:50 +05:30
Rohit Waghchaure
ebe1ebead2 [Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations' 2018-05-14 13:21:45 +05:30
Jamsheer
d0b0c87f40 get additional salary component in salary slip 2018-05-14 12:16:46 +05:30
Jamsheer
08b60a1a62 New Doctype - Additional Salary Component 2018-05-14 12:16:46 +05:30
Jamsheer
a5028c8e54 Salary Structure - filter updated, Salary Component - fields re-arranged 2018-05-14 12:16:45 +05:30
Jamsheer
b5c5c471b4 Formula on Salary Component Master 2018-05-14 12:16:45 +05:30
Jamsheer
4bd7cdb018 Salary Structure Assignment - filters applied 2018-05-14 12:13:47 +05:30
Manas Solanki
a27d29b349 enable deferred revenue in the item master 2018-05-14 12:07:14 +05:30
Zlash65
f665189ab3 tree based changes 2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7 added fixtures for supplier-group, changed analytics report accordingly 2018-05-14 11:45:38 +05:30
Zlash65
c88ce364ce treeview implemented for supplier group 2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635 patch to reload_doc and rename field 2018-05-14 11:45:38 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Zlash65
0a50554417 doctype level changes 2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18 json level changes 2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed rename supplier-type to supplier-group 2018-05-14 11:42:30 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue 
Fixed spelling
 2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe Fixed spelling 2018-05-13 16:17:18 +05:30
Saurabh
c1acbdfb69 [fix] overlapping dates 2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610 add get leave period method 2018-05-12 17:45:39 +05:30
Faris Ansari
f2b3307136 Remove escaped customer string (#13986) 
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
 2018-05-11 21:07:27 +05:30
Jamsheer
46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967) 
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
 2018-05-11 21:05:24 +05:30
Pawan Mehta
c53e35368d Shift Management - Documentation and Tests (#13997) 
* [fix] #13996

* codacy fix
 2018-05-11 21:03:50 +05:30
Gaurav Naik
9502476c67 Accounting Period overlap validation 2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226 Accounting Period autoname 2018-05-11 07:52:50 +05:30
Ranjith
ded636097e Tax Declaration, Proof Submission tests 2018-05-10 15:42:04 +05:30
Ranjith
5a8e6427f4 Tax Declaration, Proof Submission, validation 2018-05-10 15:06:49 +05:30
Ranjith
85d2d571c5 update hr menu, field subcategory in child table 2018-05-10 15:04:32 +05:30
Ranjith
e1c556b7e0 Doctype Employee Tax Exemption Sub Category 2018-05-10 15:02:57 +05:30
Ranjith
96121c598e Tax Declaration, Proof Submission, field company 2018-05-10 15:02:00 +05:30
Kanchan Chauhan
d560da950d [Minor] Show only active driver in Delivery Trip 2018-05-10 10:42:56 +05:30
Jamsheer
9032c9d91d Documentation - updated 2018-05-09 19:19:34 +05:30
Nabin Hait
9d215c2d9b Set operations on production order while making from Material Request 2018-05-09 18:32:54 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f Added finance book filtering logic to financial_statements.py 2018-05-09 15:03:40 +05:30
Gaurav Naik
8cbbdfdf30 Added finance book filter to financial_statements.js 2018-05-09 15:03:05 +05:30
Gaurav Naik
40559d5f5c Added finance book filter logic to ReceivablePayable 2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51 Added finance book filter in accounts_receivable.js 2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f Added finance book filter in accounts_payable.js 2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c Added finance book filter logic in general_ledger.py 2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d Added finance book filter to General Ledger 2018-05-09 14:57:36 +05:30
Gaurav Naik
a6d3cbfbc5 Added finance book field to GL Entry doctype 2018-05-09 14:56:52 +05:30
Gaurav Naik
30f9e0f547 Set finance book in make_gl_entries 2018-05-09 14:56:39 +05:30
Gaurav Naik
a948726ddd Added Finance Book doctype 2018-05-09 14:53:51 +05:30
Manas Solanki
fbe548e4be [Enterprise] Bank Guarantee Enhancements (#13960) 2018-05-09 14:49:53 +05:30
Vishal Dhayagude
3cf0d51e65 [fix] Compounding error in task weight (#13958) 
* [fix] Compounding error in task weight

* [minor] minor changes

* [fix] Requested Changes added
 2018-05-09 10:42:39 +05:30
Jamsheer
63a8f83076 Leaves - Documentation 2018-05-08 18:45:41 +05:30
Nabin Hait
3881e98000 Staffing plan for group company 2018-05-08 18:36:14 +05:30
Jamsheer
4573e6609f Leave Type - remove field is_parental_leave 2018-05-08 18:33:49 +05:30
Nabin Hait
b2800eeb2a Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-05-08 16:34:35 +05:30
Nabin Hait
9036b9ee85 Merge branch 'master' into develop 2018-05-08 16:31:42 +05:30
Nabin Hait
0ff31f0ebf bumped to version 10.1.31 2018-05-08 17:01:38 +06:00
Nabin Hait
247bd94824 Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing 2018-05-08 16:30:18 +05:30
Zarrar
f2df7f32fa update subscription to auto_repeat across dashboards (#13956) 2018-05-08 16:06:36 +05:30
Nabin Hait
3e47fbb2f0 assign salary structure custom button 2018-05-08 16:05:04 +05:30
Saurabh
40349f4b00 [fix] add stock entry link on Material Request Dashboard (#13950) 2018-05-08 15:23:51 +05:30
Saurabh
b36517158b [fix] cheque print template coordinates (#13959) 2018-05-08 15:23:29 +05:30
Jamsheer
bec950428c HR Utils - Trailing whitespace 2018-05-08 12:50:14 +05:30
Manas Solanki
cf26b2ca1c [minor] fix for the student report card 2018-05-08 12:39:02 +05:30
Jamsheer
fe882bc68a Leave Application - Test - Leave allowed, applicable after, maximum continuos days 2018-05-08 12:36:51 +05:30
Jamsheer
3153734e7e Leave Application - validate applicable after for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
62a93533fc Leave Policy - Validate Annual alloction for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
d7bfa2303f Leave allocation - validate max leave allocation days for a leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b42f3d41ab Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b408b158dd Leave allocation - link to leave period and compensatory leave request 2018-05-08 12:35:40 +05:30
Jamsheer
8c4386f016 Leave Type - new field is_compensatory 2018-05-08 12:35:40 +05:30
Jamsheer
c7aaf0ba67 Leave Period - Validate and Create Leave Allocation 2018-05-08 12:35:40 +05:30
Jamsheer
0e2cc5574d HR Util methods 2018-05-08 12:35:40 +05:30
Jamsheer
9d857579af Attendance Request - validate and create attendance 2018-05-08 12:35:40 +05:30