Sagar Vora
1ef50c89db
[minor] use party_name instead of party and save GSTIN in uppercase
2017-06-28 23:52:22 +05:30
Rohit Waghchaure
2e4b4454b3
[Fix] Module error during patch execution
2017-06-28 17:31:59 +05:30
rohitwaghchaure
4b33b7e1c1
Merge pull request #9418 from nick9822/nick9822-patch-3
...
Removed "Asset" filter on payment account
2017-06-28 16:38:21 +05:30
rohitwaghchaure
69279229cc
Merge pull request #8987 from bcornwellmott/bom_convert_uom
...
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Rohit Waghchaure
5b7028c7bb
stock qty not changed if item change
2017-06-28 15:58:51 +05:30
mbauskar
e9a4f4e70d
bumped to version 8.1.6
2017-06-28 14:02:29 +06:00
Saurabh
be03de3ad6
Merge pull request #9502 from mbauskar/patch-fix
...
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:28:33 +05:30
mbauskar
6daa6e422e
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:26:50 +05:30
Saurabh
07913c3ff2
[fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note
2017-06-28 13:16:50 +05:30
mbauskar
3b0e6cecd6
[minor] fixed broken image url in gst documentation
2017-06-28 12:29:19 +05:30
Ashwini Save
544de60d36
Adding ERPNext logo for email tempates.
2017-06-28 11:44:09 +05:30
Manas Solanki
d652221071
fetch queries for the students in the student group
2017-06-28 11:26:41 +05:30
mbauskar
3bf9071598
bumped to version 8.1.5
2017-06-28 11:31:40 +06:00
mbauskar
27692670b1
[fix] handle email exception if email account is not configured
2017-06-28 10:56:50 +05:30
Saurabh
3f2dd04b10
[fix] reload gst settings doctype in patch
2017-06-28 10:50:38 +05:30
mbauskar
4e0999dda7
bumped to version 8.1.4
2017-06-28 11:10:07 +06:00
Makarand Bauskar
eef3f62ff7
Merge pull request #9488 from rmehta/gst-reminder
...
[regional] ability to send gst reminders to all parties
2017-06-27 19:33:05 +05:30
Makarand Bauskar
104eb8c6ad
[minor] render GSTIN value as "" instead of None
2017-06-27 18:59:35 +05:30
Manas Solanki
3959c7c3c1
filter out students which are already enrolled in program enrollment
2017-06-27 18:22:05 +05:30
Makarand Bauskar
b43f4073db
fixed TypeError: throw() got an unexpected keyword argument 'exception'
2017-06-27 18:15:52 +05:30
Rushabh Mehta
01659271be
[minor] dont make fixtures again by patch
2017-06-27 18:05:54 +05:30
Rushabh Mehta
c616a4a527
[tests] codacy
2017-06-27 17:50:15 +05:30
Rohit Waghchaure
eb7eb43dfc
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-27 17:34:44 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Makarand Bauskar
7b6e09b9a7
Merge pull request #9487 from rohitwaghchaure/currency_label_issue
...
[fix] Currency label not displaying in the total advance field
2017-06-27 16:16:22 +05:30
Makarand Bauskar
90a3e60de7
Merge pull request #9372 from pratu16x7/serial-batch-entry
...
Serial no/batch entry dialog
2017-06-27 16:12:30 +05:30
Rohit Waghchaure
f3e91e2b2b
[minor] Currency label not displaying in the total advance field
2017-06-27 15:51:35 +05:30
pratu16x7
846f5d4bd8
[fix] cloning rows
2017-06-27 14:03:56 +05:30
Makarand Bauskar
51520f9de6
Merge pull request #9479 from frappe-pr-bot/translations-2017-06-27
...
[translation] translation update
2017-06-27 13:58:04 +05:30
frappe-pr-bot
8ddd946dea
[translation] translation updates
2017-06-27 10:10:50 +02:00
Saurabh
c20abf6b2a
send email to system managers about gst setup
2017-06-27 13:21:57 +05:30
mbauskar
8c3f99f12e
revert customer-orders-invoices-and-shipping-status.md documentation
2017-06-27 12:49:10 +05:30
Rushabh Mehta
9b09ff29d2
[fix] address creation for india/setup.py
2017-06-27 12:17:39 +05:30
Rushabh Mehta
f4e908bd91
[minor] general_ledger.js
2017-06-27 11:56:30 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
pratu16x7
f970ca4d35
Update docs
2017-06-27 10:12:58 +05:30
pratu16x7
29cebbb0cd
use set_value() for setting rows
2017-06-27 09:48:28 +05:30
Rohit Waghchaure
0b078fb4cb
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-27 00:06:40 +05:30
pratu16x7
89d001caf3
[lint] fixes
2017-06-26 17:45:49 +05:30
tunde
6837e69187
Merge branch 'develop' into issue-9424
2017-06-26 13:05:27 +01:00
tunde
5824ae98d9
calls local to build frappe.form_dict in order to pass failing test
2017-06-26 12:42:11 +01:00
Rohit Waghchaure
67526f244e
[enhance] Report for analysis of support hours count
2017-06-26 17:04:52 +05:30
tunde
67cbeb1bb0
Merge branch 'develop' into issue-9096
2017-06-26 12:11:07 +01:00
tunde
8859eb23a3
set form_dict correctly
2017-06-26 12:01:41 +01:00
pratu16x7
ae450fc23b
async call to require, more validation
2017-06-26 15:31:46 +05:30
nick9822
82e816054e
Added report_type to payment account filter
2017-06-26 15:29:44 +05:30
tunde
ea7768d3f3
fixes form_dict failure in travis test
2017-06-26 10:17:53 +01:00
Manas Solanki
cb650f836e
validation of student in student attendance
2017-06-26 14:11:12 +05:30
Saurabh
095701e86b
bumped to version 8.1.3
2017-06-26 14:25:59 +06:00
pratu16x7
5f389c999a
[fix] values update in items in invoices
2017-06-26 13:38:24 +05:30
Saurabh
29fa0a9a17
[fix] patch fixes
2017-06-26 13:28:45 +05:30
tunde
c1d22adb9f
Merge branch 'develop' into issue-9424
2017-06-26 08:52:55 +01:00
tunde
bce13cd0e3
fixes failing test
2017-06-26 08:43:25 +01:00
Saurabh
3bf5a38c6f
bumped to version 8.1.2
2017-06-26 11:31:37 +06:00
Makarand Bauskar
c93de0e803
[minor] removed global roles from company doctype field's depends on propery ( #9450 )
2017-06-24 10:39:30 +05:30
Rushabh Mehta
d03203966a
[minor] fix old patch
2017-06-24 10:37:19 +05:30
Console Admin
8623166dca
Customer Query include Searchfields
...
frappe/erpnext#8821
2017-06-23 20:32:52 +03:00
pratu16x7
577e4c4e28
Add in transaction.js, cleanups
2017-06-23 19:25:01 +05:30
Makarand Bauskar
ebaea08225
Merge pull request #9437 from Arundhatii/20Jun
...
Added help pages and deleted old images links to #9241
2017-06-23 18:54:45 +05:30
Makarand Bauskar
1a78a3244b
removed conflicts
2017-06-23 18:37:08 +05:30
rohitwaghchaure
8f51a5e527
In POS on click of delete button, remove the selected item from the cart ( #9428 )
2017-06-23 18:17:04 +05:30
Makarand Bauskar
1d962dd3f7
removed conflicts
2017-06-23 18:11:58 +05:30
Makarand Bauskar
bbf81aa3a4
image title translation
2017-06-23 18:11:00 +05:30
Makarand Bauskar
862302f02d
image title translation
2017-06-23 18:10:06 +05:30
Makarand Bauskar
408336e7ad
image title translation
2017-06-23 18:08:45 +05:30
Makarand Bauskar
ab49c3100d
corrected image title
2017-06-23 18:04:56 +05:30
Makarand Bauskar
ec27a30069
Merge pull request #9442 from creamdory/develop
...
BOM Stock Report to allow Multi Level Warehouse Setup
2017-06-23 17:59:56 +05:30
Makarand Bauskar
5e994ddf65
removed white spaces
2017-06-23 17:58:50 +05:30
Makarand Bauskar
4eced4acec
Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco
...
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 17:24:50 +05:30
Frappe
a951e56f9c
Modified help pages
2017-06-23 16:49:35 +05:30
Frappe
1f8e5fbcb1
Edited help page
2017-06-23 16:48:46 +05:30
Frappe
ca6fed359b
Added help pages for Subcontracting and deleted old images
2017-06-23 16:48:17 +05:30
creamdory
9961fb82d6
Bom Stock Report Change Requests
2017-06-23 15:57:52 +08:00
Rohit Waghchaure
8326028d33
Don't validate delivery note and sales order required for the POS invoice
2017-06-23 12:56:12 +05:30
Rohit Waghchaure
666d004b40
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 12:10:21 +05:30
Frappe
9a8f33f855
Replaced screenshot in help pages, links to #9241
2017-06-23 11:30:26 +05:30
Frappe
8181a7463e
added help page for Kanban Board, links to #9241
2017-06-23 11:30:26 +05:30
Frappe
ac08fbd438
added test documentation
2017-06-23 11:30:26 +05:30
Rushabh Mehta
210b6f8f7e
[docs]
2017-06-22 22:32:08 +05:30
Rushabh Mehta
25366a22ad
[minor] cleanup
2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
tunde
94500fd17b
adds test case
2017-06-22 17:34:54 +01:00
tunde
dcd54209fc
parameterises sql string
2017-06-22 14:03:19 +01:00
pratu16x7
759f669214
Add in delivery note
2017-06-22 18:14:29 +05:30
pratu16x7
70eca9462b
make erpnext.SerialNoBatchSelector
2017-06-22 18:14:29 +05:30
pratu16x7
60d9446656
onchange in df
2017-06-22 18:14:29 +05:30
pratu16x7
934105bf34
fix modified by, blur serial field
2017-06-22 18:14:28 +05:30
pratu16x7
26b8f5c3ce
[minor]
2017-06-22 18:14:16 +05:30
pratu16x7
36693e27be
[fix] tests
2017-06-22 18:14:16 +05:30
pratu16x7
a5d5403bf3
specific change bubbling for grid fields
2017-06-22 18:13:56 +05:30
pratu16x7
0e35651e94
Add get_stock_qty test
2017-06-22 18:13:56 +05:30
pratu16x7
837ffbddbc
[minor]
2017-06-22 18:13:55 +05:30
pratu16x7
ff25573558
cleanup
2017-06-22 18:13:55 +05:30
pratu16x7
82a199d6d7
[fix] availably qty reupdate
2017-06-22 18:13:55 +05:30
pratu16x7
d15a507567
add serial_no_check
2017-06-22 18:13:55 +05:30
pratu16x7
01e79f033e
add warehouse selection and mapping
2017-06-22 18:13:55 +05:30
pratu16x7
9a6e675b41
wip
2017-06-22 18:13:55 +05:30
pratu16x7
7331f169fc
[fix] warehouse required bug
2017-06-22 18:13:54 +05:30
pratu16x7
d09f35fa98
fire modal on item_code, events, validation
2017-06-22 18:13:54 +05:30
pratu16x7
52d703a232
[fix] test
2017-06-22 18:13:54 +05:30
pratu16x7
e4e00d2215
batch item distribution by oldest, serial no check
2017-06-22 18:13:54 +05:30
pratu16x7
60944e3397
get oldest batch in modal, insert batch items
2017-06-22 18:13:30 +05:30
pratu16x7
0b642cd414
set available qty
2017-06-22 18:13:30 +05:30
pratu16x7
b4de1c771b
WIP
2017-06-22 18:13:30 +05:30
Rushabh Mehta
aedaac63ea
[wip] batch, serial number selector
2017-06-22 18:13:30 +05:30
mbauskar
04c8bf0b21
bumped to version 8.1.1
2017-06-22 17:30:25 +06:00
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
tunde
96e629a635
adds credits notes to report since double entry for P or L affects sales
2017-06-22 10:04:33 +01:00
mbauskar
ea77b63b4a
bumped to version 8.1.0
2017-06-22 13:40:58 +06:00
Makarand Bauskar
79d36c7c43
Merge pull request #9423 from mbauskar/patch-fix
...
[minor] save the system settings document
2017-06-22 12:49:35 +05:30
mbauskar
4b299ba009
[minor] save the system settings document
2017-06-22 12:46:31 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Rohit Waghchaure
2d9b3cd270
Fixed test cases
2017-06-22 12:23:15 +05:30
Ben Cornwell-Mott
ac3ad0810a
Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom
2017-06-21 10:17:39 -07:00
Ben Cornwell-Mott
1e96b7bbe5
Added conversion_factor update in patch
2017-06-21 10:16:50 -07:00
Makarand Bauskar
0ea5d941e6
Merge branch 'develop' into bom_convert_uom
2017-06-21 21:35:38 +05:30
nick9822
881491cd2b
Removed "Asset" filter on payment account
2017-06-21 19:51:08 +05:30
Makarand Bauskar
1b6746e3bc
Merge pull request #9388 from saurabh6790/dropbox_doc_fix
...
[update] dropbox documentation to show how to set redirect url to create access token
2017-06-21 19:10:45 +05:30
Makarand Bauskar
cdfccffc0d
Merge pull request #9341 from manassolanki/training-event
...
send email on update and on update after submit
2017-06-21 19:09:21 +05:30
Makarand Bauskar
7a2a2dad35
Merge pull request #9381 from almeidapaulopt/so_proj
...
link sales order to new project
2017-06-21 18:48:30 +05:30
Umair Sayyed
5057098a19
Updated help pages and removed old images, links to #9262
2017-06-21 17:54:39 +05:30
Makarand Bauskar
ce7087f08a
Merge pull request #9408 from mbauskar/develop
...
merged hotfix branch to develop
2017-06-21 16:41:33 +05:30
Makarand Bauskar
b37eb10421
Merge pull request #9382 from nick9822/nick9822-patch-1
...
Resetting batch and serial nos checks
2017-06-21 16:34:32 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
mbauskar
9b4690995e
bumped to version 8.0.51
2017-06-21 13:47:12 +06:00
Manas Solanki
29ba4143f9
make quotation against lead company name ( #9188 )
2017-06-21 12:55:27 +05:30
Makarand Bauskar
9b5d1fc458
Merge pull request #9401 from sagarvora/so-calendar
...
[fix] get status in calendar view and show green background
2017-06-21 12:41:27 +05:30
Manas Solanki
7f64f623f0
Trigger assessment plan every time page loads
2017-06-21 12:08:23 +05:30
Sagar Vora
6371b53b7e
[fix] get status in calendar view and show green background
2017-06-21 11:58:29 +05:30
Saurabh
8d269beb45
[minor][fix] pass template item name to make_variant_item_code
2017-06-20 20:14:14 +05:30
Makarand Bauskar
cd5dd890aa
Merge pull request #9384 from nick9822/nick9822-patch-2
...
Bug while fetching stock balance of new item.
2017-06-20 19:52:28 +05:30
Saurabh
88b642637b
update dropbox documentation to show how to set redirect url to create access token
2017-06-20 19:01:16 +05:30
Umair Sayyed
357cd6df90
added new images, links #9262
2017-06-20 18:19:50 +05:30
Umair Sayyed
3292e59dcd
Replaced old images with new, links to #9262
2017-06-20 18:17:40 +05:30
nick9822
cc699a94fd
Bug while fetching new item balance.
2017-06-20 17:13:29 +05:30
nick9822
43a48fd2bc
Resetting batch and serial nos checks
2017-06-20 17:02:55 +05:30
Paulo Almeida
2d5e65ddcf
link sales order to new project
2017-06-20 12:08:22 +01:00
frappe-pr-bot
db4bb720b8
[translation] translation updates
2017-06-20 11:22:36 +02:00
Makarand Bauskar
8fac4314aa
Merge pull request #9373 from sagarvora/gh-9289
...
Check for align_labels_left before adding text-right class
2017-06-20 14:31:22 +05:30
Sagar Vora
89d60ca35e
Check for align_labels_left before adding text-right class
2017-06-20 14:16:06 +05:30
Rushabh Mehta
17e6bb83eb
[fix] typo, item group route to have parent only for non root
2017-06-20 14:07:33 +05:30
Makarand Bauskar
958b06b129
Merge pull request #9369 from sagarvora/gh-4559
...
[minor] calculate balance in company currency instead of account currency
2017-06-20 13:26:10 +05:30
Ayush Shukla
a111f78566
Leaderboard of customers, items, suppliers and sales partner ( #9354 )
...
* First commit leaderboard working
* Styling and added href
* Changed timeline string
* Changes in item
* Cleanup
* Fix
* made changes to currency column
* Code cleanup for codacy
* Sorting bug fixed and formatting done
* Changed type to isinstance
2017-06-20 13:04:45 +05:30
Vishal Dhayagude
310d4dc9e0
UOM column in Batch Wise Balance History Report ( #9359 )
...
* Training Events/Results link to employee dashbord
* [minor]Improve validation message for Buying / Selling Setting
* [minor]Added UOM cloumn in Batch Wise Balance History Report
* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Britlog
faf75c4ddd
Fix and improve shopping cart ( #9348 )
...
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Rushabh Mehta
c422874418
Update company.py
2017-06-20 12:19:36 +05:30
Rushabh Mehta
777526e3a8
Update __init__.py
2017-06-20 12:14:32 +05:30
Makarand Bauskar
22773a29f7
Merge pull request #9356 from tundebabzy/issue_6510
...
adds information about "Is Paid" and "Update Stock"
2017-06-20 12:04:16 +05:30
Sagar Vora
5b08d7acb3
[minor] calculate balance in company currency instead of account currency
2017-06-20 11:50:23 +05:30
