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

23219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles-Henri Decultot
8b3e841fbf Travis correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6 Review corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3 Test correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a Codacy corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
bbed5d41ca Remove remaining images 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
63e1dd5993 Remove doc 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3 Dev cleanup 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7 Remove payment plan reference 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631 Subscription integration 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9 Corrections to Subscriptions 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d Stripe integration corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a45ea63b5d Codacy correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6c2ad66522 Codacy corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a27673ecfe Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
79380c6a74 Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
30da37fbb8 Move Stripe to ERPNext 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
e25d2ee66d Update Stripe Documentation 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad Payment Request modifications 2018-07-13 13:05:54 +00:00
Nabin Hait
03b597418a Patch order fixed 2018-07-13 17:45:27 +05:30
Saurabh
3d825e5689 Subscription test and fixes (#14875) 
* Add dashboard on subscriber screen

* Add Subscription and Subscription Plan to Account Dashboard

* Fetch customer name while creating subscriber

* [fix] add section for Subscription Period

* minor fixes

* optimization
 2018-07-13 17:41:36 +05:30
Nabin Hait
d2e42d3d86 Merge branch 'update_qty_rate' into develop 2018-07-13 17:02:40 +05:30
Nabin Hait
b2da082798 Fixed logic and tests 2018-07-13 17:02:08 +05:30
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