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

13460 Commits

Author SHA1 Message Date
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Saurabh
381d452b78 bumped to version 10.0.14 2018-01-24 11:52:53 +06:00
Saurabh
6cc10104f0 [fix] enable rename for payment terms and payment term template 2018-01-24 11:15:02 +05:30
rohitwaghchaure
56a4f9205a
Merge pull request #12620 from mntechnique/draft-mode-print 
Print Functionality in Online POS using allow print before pay check
 2018-01-24 10:54:07 +05:30
Saurabh
9c6bf08e77
Merge pull request #12547 from joshreeder/patch-1 
Update dropbox-backup.md
 2018-01-24 07:57:15 +05:30
Saurabh
4b9a55b0ef [fix] If buying or selling price list not found, return empty dict 2018-01-24 07:48:56 +05:30
Saurabh
b665baec72 Used cint instead of int 2018-01-23 18:28:05 +05:30
Saurabh
c8399fd093
Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno 
Disabled property set only once for has serial no and has batch no field in item doctype
 2018-01-23 18:08:56 +05:30
Rohit Waghchaure
266e66cd1b Disabled property set only once for has serial no and has batch no field in item doctype 2018-01-23 18:06:12 +05:30
Saurabh
a5c9fc3705 Removed commented code 2018-01-23 17:36:41 +05:30
rohitwaghchaure
f3a452850e
Merge pull request #12617 from saurabh6790/ux_fix 
parse value before setting it to dissable_rounded_total on Purchase Invoice
 2018-01-23 17:35:16 +05:30
Saurabh
6c5f5b20cf Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print 2018-01-23 17:33:21 +05:30
Charles-Henri Decultot
e31e1239ba FEC report for France (#12446) 
* FEC report for France

* Codacy correction
 2018-01-23 17:23:27 +05:30
Jamsheer
58af1db0d7 Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 17:23:27 +05:30
Shreya Shah
673b59b114 Updated docs for Payroll Entry (#12552) 
* updated docs for payroll entry

* fixed a link in employee-advance doc
 2018-01-23 17:23:27 +05:30
Shreya
543feda2fb set posting date only if null 2018-01-23 17:23:27 +05:30
Saurabh
cbbee47625 [Fix] Resolved the type issue of 'is_saved' flag variable 2018-01-23 17:23:27 +05:30
Saurabh
a2076a1ff0 Multiple changes: 
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
 2018-01-23 17:23:26 +05:30
Saurabh
c5a6cf3a0e [Mod] Allows print only when the check value exists and the cart isn't empty 2018-01-23 17:23:26 +05:30
Saurabh
3a609108ae Codacy changes 2018-01-23 17:23:26 +05:30
Saurabh
32695a938f [Mod] Refactored the code for fetching allow_print_before_pay check value 2018-01-23 17:23:26 +05:30
deepak-mnt
d7da89bf5a [Fix] Resolved issues suggested by Codacy 2018-01-23 17:21:44 +05:30
deepak-mnt
8f3d394485 Minor changes:Removed extra spaces in py code 2018-01-23 17:21:44 +05:30
deepak-mnt
cc813d2286 [Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode 2018-01-23 17:21:44 +05:30
deepak-mnt
1ccb0cfa2f [Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print 
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
 2018-01-23 17:21:44 +05:30
deepak-mnt
29abe291c9 Allow draft mode print in online POS 2018-01-23 17:21:44 +05:30
Saurabh
57df096725
Merge pull request #12600 from vishdha/allow_rename 
[new] Allow Rename and Member link with user
 2018-01-23 16:49:48 +05:30
Shreya
dfae11bcee disabled warehouse in list view 2018-01-23 16:46:24 +05:30
Rushabh Mehta
b5a3df920c [fix] primary button color for make 2018-01-23 16:08:52 +05:30
rohitwaghchaure
d78e6e04ea Run country fixtures if country changed in the company (#12494) 2018-01-23 15:42:46 +05:30
Saurabh
3959aeb848 [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice 2018-01-23 15:40:43 +05:30
Charles-Henri Decultot
90657fb566 FEC report for France (#12446) 
* FEC report for France

* Codacy correction
 2018-01-23 15:40:14 +05:30
Jamsheer
d63b7e16af Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 15:38:34 +05:30
Shreya Shah
3191951bff Updated docs for Payroll Entry (#12552) 
* updated docs for payroll entry

* fixed a link in employee-advance doc
 2018-01-23 15:37:23 +05:30
rohitwaghchaure
881d32c4b8
Merge pull request #12540 from shreyashah115/posting-date 
[Payroll Entry] Set posting date only if null
 2018-01-23 15:10:26 +05:30
rohitwaghchaure
f8a98f5eeb
Merge pull request #12609 from britlog/payment-request-translation 
[Stripe] Translate payment request subject
 2018-01-23 14:47:55 +05:30
rohitwaghchaure
b607c6f8b2
Merge pull request #12610 from MaxMorais/patch-7 
Serial No, wont relates to the warehouse
 2018-01-23 14:46:46 +05:30
Frappe PR Bot
48d4a0a438 [Translation] Updated Translations (#12613) 2018-01-23 14:35:52 +05:30
rohitwaghchaure
51293390e4
Merge pull request #12611 from shreyashah115/fetch-conversion-factor 
[Fix] Fetch uom conversion factor in material request
 2018-01-23 12:41:01 +05:30
Shreya
a137fe82a1 fix error message 2018-01-23 11:00:58 +05:30
Shreya
e2b31085a7 fetch uom conversion factor in material request 2018-01-23 10:54:23 +05:30
Maxwell Morais
7cffd618ab
Serial No, wont relates to the warehouse 
The serial no, picker wont follow the target serial no
 2018-01-22 22:33:28 -02:00
britlog
ddd2bc9aac Translate payment request subject 2018-01-22 23:23:31 +01:00
Vishal
a54815fd9d [new] Allow Rename and Member link with user 2018-01-22 16:02:45 +05:30
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Saurabh
b9f678b350 bumped to version 10.0.13 2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2
Merge pull request #12573 from rohitwaghchaure/reorder_issue 
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
 2018-01-22 16:49:54 +07:00
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column 
Added currency in balance column in general ledger print
 2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb
Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue 
[Fix] Income account can not be group
 2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5
Merge pull request #12590 from shreyashah115/total-on-items-remove 
[Fix] Calculate taxes when shipping rule not present at removal of item
 2018-01-22 15:03:11 +05:30
Shreya
5164997db7 delete column status 2018-01-22 14:13:03 +05:30
Rohit Waghchaure
c4c2bf0bfb [Fix] Image patch showing in the item link 2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f calculate total when items are removed 2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe [Fix] Income account can not be group 2018-01-22 12:35:36 +05:30
Shreya
dd66bc03c7 fixes 2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a modified patches.txt 2018-01-22 12:26:41 +05:30
Shreya
4298bcfa40 modified leave application tests 2018-01-22 12:26:41 +05:30
Shreya
05f7e14b5a replaced status with workflow_state 2018-01-22 12:26:41 +05:30
Shreya
117ddac033 patch to create workflow for existing leave applications 2018-01-22 12:26:41 +05:30
Josh Reeder
c8b9648c53
Changed instructions 
No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.
 2018-01-20 15:56:15 -06:00
Rohit Waghchaure
bc94914338 [Fix] Sales payment summary issue 2018-01-20 17:01:31 +05:30
Rohit Waghchaure
f83f6aae22 [Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests 2018-01-20 15:44:38 +05:30
Rohit Waghchaure
edef642794 Added currency in balance column in general ledger print 2018-01-20 12:54:25 +05:30
britlog
d13985d1d0 Add number spinner for quantity 2018-01-19 18:31:25 +01:00
Zlash65
93344dff26 group_by_account not displayed fix 2018-01-19 19:06:39 +05:30
Rohit Waghchaure
abc0632925 Merge branch 'master' into develop 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
0e61b52022 bumped to version 10.0.12 2018-01-19 16:19:28 +06:00
rohitwaghchaure
0efd7934b8
Merge pull request #12530 from frappe/manassolanki-patch-2 
Issue in the data import while importing the invoice
 2018-01-19 15:35:23 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +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
Josh Reeder
4c38e67f1a
Update dropbox-backup.md 
Steps for open source users were wrong and there were many work arounds. i have updated the instructions with the most streamlined process.
 2018-01-18 15:38:59 -06:00
Shreya
d0b60e8254 set posting date only if null 2018-01-18 17:35:29 +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
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice 2018-01-18 11:20:24 +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
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
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
d40bfeb7d3 bumped to version 10.0.9 2018-01-15 19:06:34 +06:00
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
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
Saurabh
59edc6028d bumped to version 10.0.8 2018-01-12 17:24:26 +06:00
Saurabh
93d3020e4b
Merge pull request #12464 from Zlash65/fix-company-bom-deletion 
[Fix] Delete BOM only when found
 2018-01-12 16:47:54 +05:30
tundebabzy
e1e38a4bb9 Autoname for Batch DocType #12302 (#12461) 
* add new fields:
check: use naming series
data: series prefix

* refactor autoname:
use new function - get_name_from_hash

* add new function - get_name_from_naming_series

* refactor autoname to generate name from naming series

* PEP 8 compliance
 2018-01-12 16:30:02 +05:30
Manas Solanki
b19fd57043 [fix] set required quantity if item in bom found (#12460) 2018-01-12 16:28:30 +05:30
rohitwaghchaure
7b78f6bee6 Added rounded total in the POS and fix rounded issue in js side (#12457) 2018-01-12 16:28:16 +05:30
tundebabzy
df023bff7f add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
rohitwaghchaure
9fbed5617f [Fix] Wrong batch showing in the popup (#12421) 2018-01-12 16:22:33 +05:30
Manas Solanki
bba5fd7a38 Assessment module addition (#12417) 
* add academic session details in the Assessmet Plan

* add the academic session and few details in the assessment result

* fix codacy
 2018-01-12 16:21:09 +05:30
Zlash65
c9172e0079 delete boms only when found 2018-01-12 15:59:13 +05:30
Manas Solanki
6c3082591c change the resolution field to the text editor (#12449) 2018-01-12 12:00:13 +05:30
Nabin Hait
a49f720ee3
GSTR1 for B2B, B2CL and B2CS (#12459) 2018-01-12 11:59:59 +05:30
rohitwaghchaure
3955fa5102 [Fix] Email addres unique key issue (#12450) 2018-01-11 18:21:02 +05:30
rohitwaghchaure
02302ff009 [Fix] Incoming rate for gross profit report (#12422) 2018-01-11 12:58:46 +05:30
Sachin Mane
24e2735e19 Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381) 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"

* Add Shelf Life (Item) and Manufacturing Date (Batch) fields

* remove console.log

* fix ci issues

* Update batch.js
 2018-01-11 12:45:50 +05:30
rohitwaghchaure
5b45bcf5f3 [Fix] Report Available Stock for Packing Items Menu not working (#12400) 2018-01-11 12:39:09 +05:30
rohitwaghchaure
20dead5d91 [minor] UI change (#12440) 
* [minor] UI change

* Update company.js
 2018-01-11 12:31:14 +05:30
Charles-Henri Decultot
47ad7fb129 Multiple variant correction (#12424) 2018-01-11 12:29:45 +05:30
rohitwaghchaure
752d21e658 Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427) 2018-01-11 12:28:48 +05:30
Vishal Dhayagude
a48f69eb83 [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426) 
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings

* Update gstr_1.py
 2018-01-11 12:26:52 +05:30
Rushabh Mehta
8be6d74655
[minor] company.js buttons should be primary! 2018-01-11 11:20:16 +05:30
tundebabzy
3732033d9b
Merge pull request #12435 from tundebabzy/packing-slip-msg 
Better validation message in Packing Slip
 2018-01-11 00:32:26 +01:00
tundebabzy
6f75885d86 better validation message 2018-01-10 23:14:13 +01:00
Nabin Hait
619c42b934
GSTR1 for B2B (#12296) 2018-01-10 17:48:03 +05:30
Vishal Dhayagude
0099a09e9b [fix] fix print hide weight details in quotation print format (#12412) 2018-01-10 16:30:09 +05:30
Zarrar
94f9f48d70 set from_warehouse only if purchase_order and purpose found (#12398) 2018-01-10 16:29:40 +05:30
Nabin Hait
687dc6a424 patch fixed 2018-01-10 14:51:19 +05:30
frappe-pr-bot
a20ef08ebf [Translation] Updated Translations 2018-01-09 13:29:17 +02:00
Nabin Hait
527e6c02b3 Delete BOMs on deletion of company 2018-01-09 16:29:13 +05:30
Nabin Hait
6b89644ca7 Payment terms filter in AR report 2018-01-09 15:39:35 +05:30
Pawan Mehta
d0e7367525 [fix] #12390 (#12391) 2018-01-09 14:33:25 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
Saurabh
0b3b63a9af bumped to version 10.0.7 2018-01-09 12:25:38 +06:00
rohitwaghchaure
412e044e8f [Fix] Error in stock move from batch dashboard (#12377) 2018-01-09 11:27:35 +05:30
Zarrar
0f458b1260 show balance if permitted to view gl entry (#12385) 2018-01-09 11:27:14 +05:30
tundebabzy
da22167741 Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382) 
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.

* ui test cases

* cleanup
 2018-01-09 10:58:44 +05:30
Vishal Dhayagude
d2d54826ab [minor] Minor Changes in Membership Doctype (#12384) 2018-01-09 10:56:17 +05:30
Pawan Mehta
5b069a4e25 Added Payment Details to Sales Payment Summary Report (#12358) 
* [fix] #12357

* label changes
 2018-01-09 10:53:13 +05:30
Sachin Mane
64f48db406 Batch number selector bug fix (#12346) 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"
 2018-01-08 17:57:32 +05:30
Prateeksha Singh
8b94f1b553 [minor][buying] fix schedule date check (#12375) 2018-01-08 16:46:39 +05:30
rohitwaghchaure
7fcc21bc8b [Fix] Cart remain same even if pos profile change (#12371) 2018-01-08 15:22:22 +05:30
rohitwaghchaure
bf4c114c58 [Enhance] Provision to show inclusive tax in print (#12345) 
* [Enhance] Provision to show inclusive tax in print

* POS Print format
 2018-01-08 15:20:15 +05:30
Shreya Shah
44fa9a6d9d Last purchase rate button added back (#12135) 
* last purchase rate button added

* triggers to update rate on button

* updated modified column in buying settings

* moved trigger to get_item_details.py

* hide get_last_rate button depending on buying settings
 2018-01-08 14:58:20 +05:30
Prateeksha Singh
50b6d79758
Merge pull request #12370 from Zlash65/fix-root-node-delete 
[Fix] Delete root node for account
 2018-01-08 12:51:31 +05:30
Nabin Hait
3a972c4d85 Precision issue in stock reconciliation 2018-01-08 12:35:05 +05:30
Zlash65
745c2658eb delete root node allow 2018-01-08 11:53:52 +05:30
Charles-Henri Decultot
57187860f8 Codacy error fixes 2018-01-06 15:32:01 +00:00
Charles-Henri Decultot
356839a54b Codacy erro fixes 2018-01-06 15:22:40 +00:00
ci2014
5d3e486415
Fix english typo in source code 
Fix english typo in source code
 2018-01-06 04:04:06 +01:00
Charles-Henri Decultot
34e335ba34 Prorated Asset Depreciation 2018-01-05 17:49:06 +00:00
Prateeksha Singh
620e0981cb
Merge pull request #12347 from pratu16x7/buying-fix 
[minor][buying] fix schedule date check
 2018-01-05 21:31:58 +05:30
Prateeksha Singh
cbd06fd3c6 [minor][buying] fix schedule date check 2018-01-05 21:28:01 +05:30
Nabin Hait
2f51c6900b Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:20:05 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb Fixed merge conflict 2018-01-05 14:15:39 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Nabin Hait
c98cfbdab4 bumped to version 10.0.6 2018-01-05 13:46:59 +06:00
Nabin Hait
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +05:30
James Robertson
46196c4ad3 Setup Wizard Updates (#12337) 
Changes to support v10 ERPNext Setup Wizard
 2018-01-05 12:50:04 +05:30
Saurabh
eac2e369cf [fix] setup alias for ifnull condition (#12327) 2018-01-05 12:48:08 +05:30
Doridel Cahanap
291b26ad04 Training Documentation in DE (#12309) 2018-01-05 12:47:40 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30
tundebabzy
8f44d1c63d Payment Terms in Delivery Note #12167 (#12293) 
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.

* do nothing in payment_terms_template trigger if doctype is Delivery Note
 2018-01-05 12:46:50 +05:30
Shreya Shah
48351e0339 cancelled sales invoice totals shouldn't be reflected in leaderboard for customer (#12292) 2018-01-05 12:45:43 +05:30
Manas Solanki
171157f1b3 Fix + Enhancement in Program Enrollment Tool (#12291) 
* Fix + Enhancement in Program Enrollment Tool

* updated the docs
 2018-01-05 12:42:39 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290) 
* Companywise default tax template

* Fix test cases
 2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49 [minor] POS profile mandatory, to set as default (#12307) 2018-01-05 12:26:33 +05:30
rohitwaghchaure
1f39feb12f [Fix] PO -> PI non default taxes not fetched (#12313) 2018-01-05 12:25:45 +05:30
rohitwaghchaure
c5c6f82623 [Hotfix] Tax rate not showing in the report (#12324) 2018-01-05 12:16:16 +05:30
Nabin Hait
42688f0636 Minor fix 2018-01-04 18:12:21 +05:30
Nabin Hait
941d0af13a Fixed organization lead error 2018-01-03 14:12:56 +05:30
Nabin Hait
76625b359e Removed naming series from set_only_once in pos profile 2018-01-03 14:03:53 +05:30
Manas Solanki
76ea7a9227
Merge pull request #12301 from kennethsequeira/cust-report-vid 
Updated youtube video link for custom reports article
 2018-01-02 21:53:47 +05:30
Kenneth Sequeira
82bd3302ee updated youtube video link for custom reports article 2018-01-02 21:41:48 +05:30
Saurabh
14506d7878 Merge branch 'master' into develop 2018-01-02 12:09:25 +05:30
Saurabh
abf5fa6bbb bumped to version 10.0.5 2018-01-02 12:39:25 +06:00
tundebabzy
650a1eeede recalculate terms when document date changed (#12288) 
* recalculate terms when document date changed

* clean up
 2018-01-02 12:02:30 +05:30
Nabin Hait
96b264b314 Minor fixes 2018-01-02 11:50:29 +05:30
Kenneth Sequeira
13e5689bd9 Updated the image paths for Custom Doctype manual 2018-01-01 17:33:57 +05:30
Saurabh
2ac1835f7d [fix] if is_root is true make parent account empty (#12255) 2018-01-01 16:17:43 +05:30
Saurabh
15d53c7912 [fix] key error (#12257) 2018-01-01 16:17:14 +05:30
Saurabh
9579645ae1 [fix] if item code exists then only call get_item_details (#12258) 2018-01-01 16:17:02 +05:30
Saurabh
a6b41e855b [fix] check if null for mode of payments (#12264) 2018-01-01 16:16:50 +05:30
rohitwaghchaure
526b0bc4e9 [minor] Code cleanup (#12278) 2018-01-01 16:16:16 +05:30
rohitwaghchaure
2640c7eec5 [Fix] Validation issue for online POS profile (#12276) 2018-01-01 16:15:41 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +05:30
Jamsheer
c90195de29 Patient medical record and Consulatation (#12198) 
* Patient Medical Record - Subject field reqd=0, Subject text formated

* Consultation - remove patient details section

* Search fields are updated for Consultation and Appointment

* Translations applied on menu
 2017-12-29 14:32:13 +05:30