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

23197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doridel Cahanap
6f06cc27e6 Update Qty and Rate in PO and SO 2018-07-13 17:02:08 +05:30
Alchez
df1eae8981 Merge the Land Unit doctype with the Location doctype (#14613) 
* Merge Land Unit with the Location doctype

* Fix patch

* [minor] modification to Location structure

- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
 2018-07-13 12:50:04 +05:30
KanchanChauhan
09e680b4aa [Fix] Should not get approvers for disabled Departments (#14868) 2018-07-13 12:26:56 +05:30
Faris Ansari
b86e5cbc42 Update travis badge (#14869) 2018-07-13 12:25:45 +05:30
Ameya Shenoy
a559b0de5a Role modifications for Shareholder (#14872) 
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
 2018-07-13 11:34:19 +05:30
Saurabh
b6d5f1fea1 [fix] add staging version (#14871) 2018-07-13 11:33:31 +05:30
Prateeksha Singh
0c51d40ad0
Merge pull request #14889 from pratu16x7/support-portal 
[fix][minor] search help alignment
 2018-07-12 16:06:49 +05:30
Prateeksha Singh
4cc7957a2a [fix][minor] search help alignment 2018-07-12 16:05:57 +05:30
Zarrar
5899d98077 [ Major ] Loyalty Program Fixes (#14863) 
* fix checking of customer_group & territory of customer in loyalty program

* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options

* removed disabled field, added from_date & to_date

* loyalty program section made collapsible, added redeem check in it

* setting loyalty program improvised, manual selection if multiple found

* get_query added, amount calculation updated

* args passed rectified for expiry_date

* get loyalty_points logic improv, redemption_details logic added

* improv based on from/to date and other rectification

* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
 2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867) 
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
 2018-07-11 14:34:55 +05:30
Saurabh
e8345f9ae0 add key to trace beta version (#14859) 2018-07-10 19:05:38 +05:30
Alchez
9155e40bc7 [Fix] Set default CF in case none exist (#14829) 2018-07-09 16:57:42 +05:30
Frappe PR Bot
b48c769588 [Translation] Updated Translations (#14849) 2018-07-09 16:56:49 +05:30
Saurabh
db7324890f Merge branch 'master' into develop 2018-07-09 15:53:51 +05:30
Saurabh
f38d6d9c44 Merge branch 'hotfix' 2018-07-09 15:53:50 +05:30
Saurabh
07bb1811af bumped to version 10.1.42 2018-07-09 16:23:50 +06:00
rohitwaghchaure
f07462860b
Merge pull request #14846 from shreyashah115/fix-digest 
Filter out pending orders based on company
 2018-07-09 14:48:13 +05:30
Ranjith Kurungadam
ea089d67ce Employee Benefit Application - fix (#14837) 2018-07-09 14:01:18 +05:30
rohitwaghchaure
720b06495c [Fix] Not able to save project (#14848) 2018-07-09 13:57:16 +05:30
Shreya
83ad646af4 Filter out pending orders based on company 2018-07-09 12:14:03 +05:30
rohitwaghchaure
8179bcbabd [Fix] Code cleanup (#14843) 2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a [Fix] Unable to print Salary Register (#14844) 2018-07-09 09:28:56 +05:30
rohitwaghchaure
6be8bea934 Provision to view return entries in Sales Person-wise Transaction Summary (#14830) 2018-07-08 19:25:13 +05:30
Shreya Shah
21d3352aa2
Merge pull request #14835 from shreyashah115/print-hide 
Print hide loyalty program related fields
 2018-07-06 18:36:47 +05:30
Zarrar
8111705f82
Merge pull request #14833 from Zlash65/min-ac-fix 
[Minor] Change field name in Accounts utils
 2018-07-06 18:24:55 +05:30
Shreya
9bcb959f81 Print hide loyalty program related fields 2018-07-06 18:17:02 +05:30
Shreya Shah
c8c17ff5cf Return if Item Defaults exist (#14834) 2018-07-06 18:07:28 +05:30
Zlash65
1aeca1d349 change name that fetches numbered value from acc & cc 2018-07-06 17:15:33 +05:30
Zarrar
17705f932d [ Minor ] Cost Center Number field added in field's dialog (#14781) 
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function

* rename function's name appropriately
 2018-07-06 14:44:44 +05:30
Alchez
8f2a0f3d79 [Fix] Incorrect assignment of Serial No in POS Invoice (#14772) 
* Fix incorrect assignment of serial no in Sales Invoice through POS

* Add conversion factor to quantity check
 2018-07-06 14:36:52 +05:30
Ranjith Kurungadam
6429ba9ed9 Payroll Entry - fix query, get assignment by end date (#14827) 2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Saurabh
0b9129e519 Merge branch 'hotfix' 2018-07-06 13:02:58 +05:30
Saurabh
778e06d0ee bumped to version 10.1.41 2018-07-06 13:32:57 +06:00
rohitwaghchaure
3f5e80ebe3 Allow bulk edit for the sales invoice item (#14826) 2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd Loyalty Program (#12631) 
* First Cut for the Loyalty Program

* finished the collection part

* redmeption for the loyalty point

	update the loyalty point entry in the FIFO style
	make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
	update the outstanding balance in the client side

* completed for the desk viewe

* wrap up for the desk and shopping cart

* pos

* fix and test the travis
 2018-07-06 12:36:57 +05:30
rohitwaghchaure
ea943c6fe4 [Fix] Due date validate issue in the POS (#14825) 2018-07-06 12:28:58 +05:30
Ranjith Kurungadam
5d134e0465 TDS Calculate tax for whole period on deduct checkboxes (#14824) 
* Tax Exemption Proof Submission - fields submission_date, exemption_amount

* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary

* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
 2018-07-06 11:57:32 +05:30
rohitwaghchaure
839320dca5 [Fix] Original Invoice outstanding is not updating after making Debit Note (#14821) 2018-07-06 10:42:15 +05:30
Andrew McLeod
686284261d Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. (#14811) 2018-07-06 10:41:37 +05:30
rohitwaghchaure
82a9fde921 Added compact print option for the material request (#14799) 2018-07-06 10:40:51 +05:30
bobzz-zone
58236ffc1e Update budget_variance_report.py (#14798) 
Make sure GL Entry only called once in each row
 2018-07-06 10:39:00 +05:30
Saurabh
b35721029b
Merge pull request #14820 from saurabh6790/fix_task_status 
[fix] Add Overdue status in Project Task
 2018-07-06 05:54:47 +05:30
Saurabh
f403031449 [fix] Add Overdue status in Project Task 2018-07-05 19:38:59 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes (#14787) 
* [cleanup] add dashboard to leave policy, employee form cleanup

* [test] first_name in employee

* [fix] tests

* [fix] tests

* [fix] tests

* [hr] add more dashboards

* [minor] fixes + ux
 2018-07-05 15:19:28 +05:30
Rushabh Mehta
c1b430c8bd
[enhance] added priority to issue (#14815) 2018-07-05 11:38:02 +05:30
Rushabh Mehta
2a5dc911e6 [github] remove issue template 2018-07-05 10:47:59 +05:30
Rushabh Mehta
b9b2bc9ace
Update PULL_REQUEST_TEMPLATE.md 2018-07-05 10:45:48 +05:30
Zarrar
a3f6856d81 python 3 fix for sorted (#14814) 2018-07-05 10:37:39 +05:30
Nabin Hait
d4453aef68 Fixed permission issue 2018-07-04 16:38:10 +05:30