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

21104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Rohit Waghchaure
16cde58821 Merge branch 'hotfix' 2018-01-19 13:29:56 +05:30
Rohit Waghchaure
e1815f0989 bumped to version 10.0.11 2018-01-19 13:59:56 +06:00
rohitwaghchaure
c59d52d073
Merge pull request #12550 from rohitwaghchaure/po_permission_issue 
[Fix] Error in PO. No Permission for Buying Settings
 2018-01-19 13:00:36 +05:30
rohitwaghchaure
7b605a628e
Merge pull request #12543 from rohitwaghchaure/precision_issue_bom 
[Fix] Precision issue while making material requests from production planning tool
 2018-01-19 13:00:16 +05:30
Rohit Waghchaure
2f3ad64bd6 [Fix] Precision issue while making material requests from production planning tool 2018-01-19 12:47:55 +05:30
Rohit Waghchaure
86cbde9057 [Fix] Error in PO. No Permission for Buying Settings 2018-01-19 12:45:53 +05:30
rohitwaghchaure
65a669c81e
Merge pull request #12534 from rohitwaghchaure/patch_fix_v7 
[Fix] Timesheet patch
 2018-01-19 11:37:18 +05:30
rohitwaghchaure
39e0d1b7d6
Merge pull request #12539 from rohitwaghchaure/minor_sales_payment_summary_issue 
[Fix] Sales payment summary issue
 2018-01-19 11:34:48 +05:30
Rohit Waghchaure
de420322b5 [Fix] Sales payment summary issue 2018-01-18 17:20:21 +05:30
rohitwaghchaure
c8e016522d
Merge pull request #12533 from rohitwaghchaure/pos_css_issue 
[Fix] POS css
 2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1 [Fix] POS css 2018-01-18 16:10:19 +05:30
Rohit Waghchaure
95adb60a8f Fix patch 2018-01-18 15:52:52 +05:30
rohitwaghchaure
bd47abdc9a [Enhance] Running Balance in GL Report (#12491) 
* Running Balance in GL Report

* Supplier invoice no in GL Report/Print Format
 2018-01-18 09:32:43 +05:30
Faris Ansari
00e547d319 Encode letterhead filename (#12525) 2018-01-18 09:28:13 +05:30
Nabin Hait
f1b098e03c
payment terms filter in AR Summary report (#12529) 2018-01-18 09:23:32 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
Nabin Hait
a7bcf6791e Merge branch 'hotfix' 2018-01-17 18:51:20 +05:30
Nabin Hait
f76fb50685 bumped to version 10.0.10 2018-01-17 19:21:20 +06:00
rohitwaghchaure
da941af687 Set due date in purchase invoice based on suppler invoice date (#12395) 2018-01-17 16:23:04 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522) 2018-01-17 16:14:31 +05:30
Kenneth Sequeira
7030817bf2 fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions (#12500) 2018-01-17 16:13:28 +05:30
Gaurav Naik
dc0db3a652 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-01-17 16:12:55 +05:30
Umair Sayed
d8b4c8bd5b Update index.txt (#12507) 2018-01-17 16:12:00 +05:30
Raghavendra Kamath
2967ec3d45 Add desk icons for healthcare - fixes 11838 (#12518) 
* Add desk icons for healtcare - fixes 11838

* Remove unnecessary white spaces
 2018-01-17 16:11:09 +05:30
Umair Sayed
230805b016 Update total.html (#12511) 2018-01-17 14:41:38 +05:30
rohitwaghchaure
60febc5465 [Fix] Gross profit validation issue (#12516) 2018-01-17 14:40:59 +05:30
Faris Ansari
4d4ce3e5cf Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517) 2018-01-17 14:40:27 +05:30
Vishal Dhayagude
052b51ab20 [fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513) 
* [fix]Fetch UOM conversion and stock_uom from BOM into material Request

* Update material_request.js
 2018-01-17 14:39:54 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale (#12514) 
* GL Entry on asset sale

* Asset sale test case fixed
 2018-01-17 14:39:05 +05:30
Nabin Hait
b44ef0b249 Delete employee records on deletion of company 2018-01-16 19:21:02 +05:30
tundebabzy
d0cde99743
Merge pull request #12505 from frappe-pr-bot/translations-2018-01-16 
[Translation] Updated Translations
 2018-01-16 09:59:16 +01:00
frappe-pr-bot
f12dfe7b7c [Translation] Updated Translations 2018-01-16 09:37:11 +02:00
Saurabh
4b0dd8a159 Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
Saurabh
dfb1646a16 Merge branch 'hotfix' 2018-01-15 18:36:34 +05:30
Saurabh
d40bfeb7d3 bumped to version 10.0.9 2018-01-15 19:06:34 +06:00
Saurabh
af7df6ba50
Merge pull request #12495 from netchampfaris/hotfix-add-ac-2 
[fix] is_root check
 2018-01-15 18:35:54 +05:30
Faris Ansari
f18cd2eaf7 [fix] is_root check 2018-01-15 18:30:01 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company (#12492) 2018-01-15 17:45:46 +05:30
umaepoch
832453a757 Added Delay days field to Ordered Items to be Delivered report (#12439) 
* Added Delay Days to Ordered Items to be Delivered Report

* Ordered Items to be Delivered
 2018-01-15 15:43:16 +05:30
Faris Ansari
184491bbbe [hotfix] Validate posting_time (#12484) 2018-01-15 14:18:53 +05:30
Achilles Rasquinha
b6365b729e Deleted Previous Chat Reference for Leave Application Approval (#12482) 
* deleted previous chat reference

* txt to messge

* removed comment
 2018-01-15 14:12:41 +05:30
Vishal Dhayagude
eec0f7fd6b [non_profit][fix] Chapter listing and join and leave chapter issue (#12463) 
* [fix] Chapter listing and Join and leave chapter issue

* [minor] Changes in chapter html, chapter title to chapter name
 2018-01-15 14:10:23 +05:30
Vishal Dhayagude
e04aedadcd [fix] Add to cart issue fixed (#12474) 2018-01-15 14:01:05 +05:30
ci2014
58dfc0782f Update agriculture_analysis_criteria.json (#12478) 2018-01-15 12:33:03 +05:30
Vishal Dhayagude
e88f928f0f [fix] Image with name listing (#12479) 2018-01-15 12:29:39 +05:30
Manas Solanki
8f085dc606
Merge pull request #12483 from frappe/manassolanki-patch-1 
Update utils.py
 2018-01-15 12:24:18 +05:30
Manas Solanki
e5e5d8271f
Update utils.py 2018-01-15 12:22:28 +05:30
rohitwaghchaure
0a2d83d40c [Fix] gst_state field issue (#12481) 2018-01-15 11:55:25 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30