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

22599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
edd320e338
Optimisation of warehouse_account_map (#13454) 2018-04-02 10:30:17 +05:30
Kenneth Sequeira
84fe32d05c removed pos-view article since it is deprecated (#13456) 2018-04-02 10:26:43 +05:30
Shreya Shah
a8df73c263 typo in landed cost voucher doc (#13472) 2018-04-02 10:16:27 +05:30
rohitwaghchaure
40a5a3063c [Fix] Allow zero valuation rate if previous sle has zero valuation rate (#13432) 2018-04-02 10:14:49 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements (#13423) 2018-04-02 10:14:32 +05:30
Shreya Shah
d17c24f969 set query in payment account (#13446) 2018-04-02 10:13:48 +05:30
Manas Solanki
0289ad285f fix the route filters and payment account (#13447) 2018-04-02 10:13:22 +05:30
Shreya Shah
562227db8f db escape as single quote in address causes error (#13451) 2018-04-02 10:12:37 +05:30
Achilles Rasquinha
9c1cac80fe
Merge pull request #13445 from shreyashah115/typo-in-payroll 
Typo in Payroll Entry
 2018-04-01 10:29:16 +05:30
Sathisha Poojary
1de5669574 Rename Bank Statement Settings appropriately and allow auto 
populating some settings for supported banks
 2018-03-31 10:30:34 +05:30
Sathisha Poojary
f698a1bcbe Minor typo with major error 2018-03-31 01:19:52 +05:30
Sathisha Poojary
f069e1c83c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-31 00:55:56 +05:30
rohitwaghchaure
456fdf09cb
Merge pull request #13449 from rohitwaghchaure/pos_not_working_issue 
[Fix] POS not opening
 2018-03-30 14:29:56 +05:30
Rohit Waghchaure
5e0cabc538 [Fix] POS not opening 2018-03-30 14:29:18 +05:30
Gaurav Naik
03016e5000 Exploded view for BOM Stock Report (#12506) 
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
 2018-03-30 13:03:19 +05:30
Shreya
9240eaa0a6 typo for accrual journal entry 2018-03-30 12:19:11 +05:30
Manas Solanki
618940b5c9
Merge pull request #13433 from manassolanki/fix-pe 
minor fix for the program enrollment tool
 2018-03-29 16:37:54 +05:30
Manas Solanki
ccf2b7b08b minor fix for the program enrollment tool 2018-03-29 16:36:59 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Nabin Hait
1e989b35ad Merge branch 'hotfix' 2018-03-29 13:53:00 +05:30
Nabin Hait
cae2723920 bumped to version 10.1.18 2018-03-29 14:23:00 +06:00
rohitwaghchaure
badc855400 [Fix] BOM validation issue for scrap item (#13429) 2018-03-29 13:48:38 +05:30
Manas Solanki
a4502c4f6b
Merge pull request #13430 from codingCoffee/child_doc_perm_fix 
Permisssion fixes for child table
 2018-03-29 13:27:08 +05:30
Manas Solanki
1f02c62339
Merge pull request #13431 from manassolanki/fix-22 
fix the item varint details
 2018-03-29 13:26:14 +05:30
Manas Solanki
ef770b593a fix the item varint details 2018-03-29 13:25:00 +05:30
Manas Solanki
a9c90c96a9
Merge pull request #13428 from frappe/manassolanki-patch-3 
Update get_item_details.py
 2018-03-29 13:16:40 +05:30
Ameya Shenoy
c5d222253a
Permisssion fixes for child table 
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
 2018-03-29 13:16:08 +05:30
Manas Solanki
94769d81a8
Update get_item_details.py 2018-03-29 11:15:05 +05:30
rohitwaghchaure
edd63a178f
Merge pull request #13418 from rohitwaghchaure/pdf_and_alignment_issue 
[Fix] Alignment and date issue in PDC report
 2018-03-28 17:17:37 +05:30
Rohit Waghchaure
ace68cd283 [Fix] Alignment and date issue in PDC report 2018-03-28 15:53:29 +05:30
Nabin Hait
4d9e104284 Merge branch 'master' into develop 2018-03-28 15:51:18 +05:30
Nabin Hait
d3bd151c30 Merge branch 'hotfix' 2018-03-28 15:51:16 +05:30
Nabin Hait
0794816527 bumped to version 10.1.17 2018-03-28 16:21:16 +06:00
Nabin Hait
7041a45294
Update fix_reserved_qty_for_sub_contract.py 2018-03-28 15:50:14 +05:30
Dominik Ottenbreit
561e2a534b Add Project Standard Filters (#13417) 2018-03-28 14:25:51 +05:30
rohitwaghchaure
68ba4fd697 [Fix] Multi-batch selection issue in POS (#13407) 2018-03-28 12:33:15 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121) 
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
 2018-03-28 11:51:44 +05:30
Nabin Hait
a6746407e5 Fixed waiting qty in item dashboard data 2018-03-28 11:16:12 +05:30
Nabin Hait
6c35822a35 Merge branch 'master' into develop 2018-03-28 10:40:14 +05:30
Nabin Hait
e3407083fe Merge branch 'hotfix' 2018-03-28 10:40:12 +05:30
Nabin Hait
63e40b52af bumped to version 10.1.16 2018-03-28 11:10:12 +06:00
Nabin Hait
2e203e53c6
Update fix_reserved_qty_for_sub_contract.py 2018-03-28 10:38:55 +05:30
Sathisha Poojary
148c4f9724 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-28 00:27:32 +05:30
Sathisha Poojary
0512eec54b Some minor changes addressing manual doctype renaming issues 2018-03-28 00:22:59 +05:30
Shreya Shah
c0201877dd fixed column fieldnames for translations (#13406) 2018-03-27 18:45:42 +05:30
Nabin Hait
9db28ef90d Minor fix in patch 2018-03-27 16:00:57 +05:30
Zarrar
7f4cd3f5ea Update Docs for Work Order (#13403) 
* update docs

* rename files, update pngs

* update pngs for timesheet, leftover changes
 2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Nabin Hait
745292ce98 Merge branch 'hotfix' 2018-03-27 14:22:28 +05:30
Nabin Hait
00279f27f3 bumped to version 10.1.15 2018-03-27 14:52:27 +06:00