Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,100 Commits 3 Branches 0 Tags 1 GiB
513f13df27
Commit Graph

22100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Faris Ansari
d7a3b78fdf
[py3] Cast dict_keys to list (#13663) 2018-04-16 14:39:37 +05:30
Saurabh
ea1408f2e0 [fix] enqueue salary slip print email after completing accounting entries (#13633) 2018-04-15 21:38:49 -08:00
Saurabh
f2a941b1a4 [fix] check if supplier value exists (#13616) 2018-04-15 21:37:14 -08:00
Sanjay Kumar
bc83daf0fa #13478 : Default Accounts in Item from Item Group (#13635) 
* remove external app reference and update get_warehouse_list

* resolve #13478 : Default Accounts in Item from Item Group
 2018-04-15 21:36:37 -08:00
Saurabh
ea49deb315 Merge branch 'master' into develop 2018-04-15 12:54:50 +05:30
Saurabh
ca1cfd91ea Merge branch 'hotfix' 2018-04-15 12:54:49 +05:30
Saurabh
c3d43e672b bumped to version 10.1.22 2018-04-15 13:24:49 +06:00
Saurabh
e141fdcfcc
Merge pull request #13661 from codingCoffee/pip10 
Compatibility for pip 10
 2018-04-15 12:43:28 +05:30
Ameya Shenoy
7cb8f890bc
Compatibility for pip 10 
- also some spaces and tabs fixes
 2018-04-15 03:43:21 +05:30
Faris Ansari
ed34a442a8 Obey currency filter in financial statement prints #pdd (#13648) 2018-04-13 21:34:00 -08:00
Shreya Shah
a952e40b56 fix tab (#13651) 2018-04-13 19:33:40 +05:30
Shreya Shah
6bf4e5b73b Department Tree (#13567) 
* Department Tree

* print hide fields

* create 'All Departments' as parent on setup

* patch to set lft rgt

* fix translatable string
 2018-04-13 15:09:26 +05:30
Nabin Hait
642d39098a Fixed merge conflict 2018-04-13 14:38:57 +05:30
Nabin Hait
d6aadef395 Merge branch 'hotfix' 2018-04-13 14:38:23 +05:30
Nabin Hait
11c899bc1f bumped to version 10.1.21 2018-04-13 15:08:22 +06:00
Nabin Hait
00efeb26f4 Email Account field added in Issue 2018-04-13 14:30:26 +05:30
Nabin Hait
4566d1f60c Email Account field added in Issue 2018-04-13 13:26:06 +05:30
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print (#13627) 2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b GST purchase invoice with tax breakup details (#13561) 2018-04-12 14:50:48 +05:30
rohitwaghchaure
1129ac711e [Fix] Patch (#13610) 2018-04-12 14:48:23 +05:30
rohitwaghchaure
2ea593bdd8 [Fix] POS Profile data not set in the sales invoice (#13568) 2018-04-12 13:37:08 +05:30
Frappe PR Bot
59a2a653d0 [Translation] Updated Translations (#13570) 2018-04-12 13:36:55 +05:30
Ahmed Madi
02fd6f56d6 Update leave_application.py (#13575) 
Make get_holidays function white listed
 2018-04-12 13:31:50 +05:30
Pawan Mehta
c0727633e7 [fix] #13589 (#13590) 2018-04-12 13:31:08 +05:30
rohitwaghchaure
098b444f6f [minor] Toggle required opportunity item table based on with items field (#13584) 2018-04-12 13:26:50 +05:30
rohitwaghchaure
e72bde5159 Removed expired items from the list of POS items (#13582) 2018-04-12 13:26:11 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items (#13606) 2018-04-12 13:25:03 +05:30
Ameya Shenoy
848d34f1a8 Minor fixes (#13609) 
- typo renamed make_prod_order_test_record to make_wo_order_test_record,
whereever it was missed
 2018-04-12 13:21:16 +05:30
rohitwaghchaure
2c111b7b14 Minor fix (#13600) 2018-04-11 02:20:06 -08:00
Sanjay Kumar
6225b769a6 remove external app reference and update get_warehouse_list (#13597) 2018-04-11 02:19:36 -08:00
Rushabh Mehta
fb5d678b0c
[minor] cache refactor and workflow docs (#13598) 2018-04-11 00:38:19 -08:00
Doridel Cahanap
ad76f9ad70 [Enhancement] Work Order Material Consumption (#13384) 
* Work Order Material Consumption

* Test cases and other minor fixes

* Test cases fixes

* Travis Fixes

* Work Order Material Consumption Request Changes

* Update work_order.js
 2018-04-09 10:31:28 +05:30
Nabin Hait
e9638be032 fixed merge conflict 2018-04-06 15:18:27 +05:30
Nabin Hait
f92fcdbac4 Merge branch 'hotfix' 2018-04-06 15:06:09 +05:30
Nabin Hait
1ff9e0432a bumped to version 10.1.20 2018-04-06 15:36:09 +06:00
rohitwaghchaure
c0f149a3be [Fix] Delivery notification for delivery trip (#13543) 2018-04-06 14:26:26 +05:30
Dominik Ottenbreit
82eac06505 Add Order Confirmation to PO (#13421) 2018-04-06 11:51:18 +05:30
rohitwaghchaure
2ae6cfda5f [Fix] Item variant details report (#13545) 2018-04-06 11:49:04 +05:30
KanchanChauhan
4691af6348 Get Payment Schedule from Sales Order to Sales Invoice (#13497) 2018-04-06 11:23:19 +05:30
Kenneth Sequeira
2d79e46fbd updated images for print format (#13498) 2018-04-06 11:22:37 +05:30
Jamsheer
86fd8cbf68 Healthcare dashboard (#13533) 
* Healthcare Dashboards

* Lab Test and Template - field marked in_filter = True
 2018-04-06 10:29:23 +05:30
rohitwaghchaure
22d9f0a4aa [Fix] Bin not deleted on delete of an item (#13539) 2018-04-06 10:29:07 +05:30
Saurabh
b0e409d4a8 syntax fix (#13542) 2018-04-06 10:28:40 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form (#13509) 2018-04-06 10:28:08 +05:30
Zarrar
92109b01fd translate while creating items from user progress (#13530) 2018-04-06 10:27:55 +05:30
Manas Solanki
76cbf0a044
Merge pull request #13544 from frappe/manassolanki-patch-4 
Update setup.py
 2018-04-05 21:36:01 +05:30
Manas Solanki
b2f9af71d2
Update setup.py 2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e Group email fields together and add IFSC Code (#13535) 
* [fix] #13534

* change field order cell no
 2018-04-05 14:54:51 +05:30
Prateeksha Singh
59147c0368
Merge pull request #13538 from pratu16x7/hub-fixes 
[fix] company listing context
 2018-04-05 14:53:11 +05:30
Prateeksha Singh
4b7dcfad54 [hub] add hub settings access regardless 2018-04-05 14:50:42 +05:30