Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
mbauskar
b66fb9a4c0
Merge branch 'master' into develop
2017-07-05 11:25:15 +05:30
mbauskar
4b7a30b527
bumped to version 8.2.4
2017-07-05 11:55:14 +06:00
Doridel Cahanap
5ad4a6e161
Total Stock Summary ( #9465 )
...
* Total Stock Summary
* indentation fixes and removed the for loop
* minor fixes in total stock summery report
2017-07-05 10:49:09 +05:30
rohitwaghchaure
10a4a13e5e
Remove gst reports for non indian accounts ( #9553 )
...
* remove gst reports for non indian accounts
* [Fix] GSN code auto name
2017-07-04 16:45:29 +05:30
Frappe PR Bot
3ceab64bfa
[translation] translation updates ( #9611 )
2017-07-04 16:08:14 +05:30
tundebabzy
6015f0f2ec
Inspection required before delivery isn't working for item variants ( #9362 )
...
* makes `copy_attributes_to_variant` to not ignore "Table"
* fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant`
* adds test case - tables in templates should be copied to variants
* [ci] use deprecated trusty build for now
2017-07-04 15:43:02 +05:30
rohitwaghchaure
e5ca48a76a
[fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice ( #9593 )
2017-07-04 10:54:23 +05:30
rohitwaghchaure
3e4bcfe2d8
[Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' ( #9585 )
...
* [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause'
* escaped company name in get_opening_accounts
2017-07-04 10:49:37 +05:30
Prateeksha Singh
5e4c8ecd62
Setup wizard refactor ( #9441 )
...
* cleaned up slides, yet to decide on master data
* remove item_count
* [fix] refresh slides on domain bug
* UI test
* set header image here in ERPNext
* [minor] lint checks
* [wiz] change autofilled fiscal year format
* [minor] fixed date format to dd-mm-yyyy if fiscal year is not available for country
2017-07-03 18:23:57 +05:30
Makarand Bauskar
11df066ed0
Merge pull request #9586 from Arundhatii/28June
...
Added help page for Global Search and updated old images #9241
2017-07-03 16:24:39 +05:30
Makarand Bauskar
87f2848aeb
resolved conflicts
2017-07-03 16:24:01 +05:30
Makarand Bauskar
12450fa473
Merge pull request #9558 from mbauskar/domainify-school
...
[domainify] Domainification for the Education Domain
2017-07-03 16:17:21 +05:30
Frappe
67bbcf6932
Resolved conflicts in index.md
2017-07-03 16:00:07 +05:30
Frappe
79918c66c2
Deleted old Images and added Global Search Help page
2017-07-03 15:58:14 +05:30
Makarand Bauskar
960208bae0
Merge pull request #9426 from tundebabzy/issue-9096
...
Gross Profit Does not display Reversal of sales invoice #9096
2017-07-03 15:23:21 +05:30
Makarand Bauskar
1bad1fcc00
Merge pull request #9452 from faztp12/develop
...
Customer Query include Search fields
2017-07-03 15:20:23 +05:30
Rushabh Mehta
43ef4e9047
Added first UI tests ( #9532 )
...
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
2017-07-03 11:53:07 +05:30
mbauskar
a06a600d0a
Merge branch 'master' into develop
2017-07-01 14:16:46 +05:30
mbauskar
af9d3a4db6
bumped to version 8.2.3
2017-07-01 14:46:46 +06:00
Makarand Bauskar
f39a9f1c5b
Merge pull request #9562 from mbauskar/gst-hsn-code
...
[minor] fix autoname for GST HSN Code (#9536 )
2017-07-01 14:15:18 +05:30
Sagar Vora
067991ee30
[minor] fix autoname for GST HSN Code ( #9536 )
2017-07-01 14:14:14 +05:30
Makarand Bauskar
1589ada04d
Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency
...
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-30 18:58:30 +05:30
mbauskar
ee368221cf
[domainify] Domainification for schools doctype
2017-06-30 17:58:57 +05:30
Charles-Henri Decultot
53de2f1b57
Translation correction in P&L report ( #9436 )
2017-06-30 16:45:11 +05:30
mbauskar
22aaf0cbd0
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
2017-06-30 16:43:25 +05:30
Sagar Vora
8ebc0df65f
[minor] fix autoname for GST HSN Code ( #9536 )
2017-06-30 16:42:26 +05:30
Makarand Bauskar
4095915bff
Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr
...
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-30 16:02:31 +05:30
Makarand Bauskar
abe8e2ecce
Merge pull request #9533 from rohitwaghchaure/total_amount_issue
...
[minor] Total amount not showing value in bank reconcillation
2017-06-30 14:50:23 +05:30
Makarand Bauskar
b053674781
Merge pull request #9534 from manassolanki/report
...
Course wise assessment result tool
2017-06-30 14:47:46 +05:30
Manas Solanki
bb68f8ca01
cleanup for the assessment report and added chart
2017-06-30 12:22:51 +05:30
mbauskar
0407cb0d92
bumped to version 8.2.2
2017-06-30 12:30:22 +06:00
Rohit Waghchaure
3856d14ae6
[Fix] Options must be a valid DocType for field Customs Tariff Number
2017-06-30 11:57:41 +05:30
Manas Solanki
85480b3af7
Added report in config/schools.py
2017-06-30 11:36:57 +05:30
Manas Solanki
c4125b32ee
Course wise assessment reports
2017-06-30 11:36:57 +05:30
Sagar Vora
7640858510
[minor] fix bom price resetting on validation
2017-06-29 22:20:07 +05:30
mbauskar
53e34f5c1c
bumped to version 8.2.1
2017-06-29 22:28:08 +06:00
mbauskar
0c2de6e07a
[minor] fixed the report value for deprecated report patch
2017-06-29 21:47:14 +05:30
Rohit Waghchaure
b801357ecf
[minor] Total amount not showing value in bank reconcillation
2017-06-29 18:40:01 +05:30
mbauskar
8f1f93603d
bumped to version 8.2.0
2017-06-29 15:37:26 +06:00
Aditya Duggal
f1bd39c937
Allow NA values in GSTIN number ( #9503 )
...
-Reason for allowing NA value is that if a user wants to make GSTIN number mandatory then they can do the same easily
2017-06-29 14:25:19 +05:30
Manas Solanki
800c69eec3
validate the duplicate assessment criteria
2017-06-29 13:00:22 +05:30
mbauskar
ec252c806f
resolved merge conflicts
2017-06-29 12:11:07 +05:30
mbauskar
71b4e48ea5
bumped to version 8.1.7
2017-06-29 12:39:39 +06:00
Makarand Bauskar
ae2d92ee76
Merge pull request #9523 from saurabh6790/setup_wiz_fix
...
[fix] translate domain
2017-06-29 12:07:19 +05:30
Saurabh
21cf1fd851
[fix] translate domain
2017-06-29 12:04:45 +05:30
Makarand Bauskar
a938d3956a
[minor] get doc using party_name instead of party
2017-06-29 11:58:50 +05:30
Rushabh Mehta
02b0ed4199
[fix] update-gstin
2017-06-29 11:56:14 +05:30
Vishal Dhayagude
76f93d05b7
display image in supplier's list view ( #9500 )
...
* [fix]display supplier image in desk
* Supplier image displayed in desk
* Show image in supplier desk page
* [minor] removed whitespaces
2017-06-29 11:23:13 +05:30
Makarand Bauskar
24ab20fe11
Merge pull request #9467 from rohitwaghchaure/support_hours_report
...
[enhance] Report for analysis of support hours count
2017-06-29 11:19:41 +05:30
Makarand Bauskar
1eb31db71f
Merge pull request #9466 from manassolanki/validation
...
changes in student settings for validating the students in the student groups
2017-06-29 10:48:59 +05:30
Makarand Bauskar
ef95b4d6e3
Merge pull request #9468 from manassolanki/issue-11
...
in program enrollment filter out students which are already enrolled
2017-06-29 10:48:12 +05:30
Makarand Bauskar
514c0417dd
Merge pull request #9483 from manassolanki/fix-student-fetch
...
fetch queries for the students in the student group
2017-06-29 10:47:05 +05:30
Makarand Bauskar
67f6ac848c
Merge pull request #9497 from ashwinisave35/email_template_redesign
...
Adding ERPNext logo for email templates.
2017-06-29 10:46:44 +05:30
Makarand Bauskar
5d95ebec4e
Merge pull request #9508 from rohitwaghchaure/contacts_module_error
...
[Fix] Module error during patch execution
2017-06-29 10:46:17 +05:30
Makarand Bauskar
bb7317d398
Merge pull request #9512 from mbauskar/patch-fix
...
[fixes] delete auto email report of deprecated reports and other minor fixes
2017-06-29 10:45:50 +05:30
Makarand Bauskar
550268eaf3
Merge pull request #9518 from sagarvora/gh-9516
...
[minor] fix supplier GSTIN portal not getting displayed
2017-06-29 10:43:53 +05:30
Makarand Bauskar
7f9af46da5
[minor] removed whitespace
2017-06-29 09:38:46 +05:30
Makarand Bauskar
e38eb83358
[minor] removed print statement
2017-06-29 09:35:11 +05:30
Makarand Bauskar
af00c9f70b
[minor] removed whitespaces from get_students method
2017-06-29 09:25:19 +05:30
Makarand Bauskar
5c7545da0c
[minor] passed index for string format
2017-06-29 09:07:59 +05:30
mbauskar
d6e8bb5452
[fixes] delete auto email report of deprecated reports and other minor fixes
2017-06-29 08:39:01 +05:30
Sagar Vora
435032f5bc
[minor] fix typo
2017-06-28 23:59:47 +05:30
Sagar Vora
1ef50c89db
[minor] use party_name instead of party and save GSTIN in uppercase
2017-06-28 23:52:22 +05:30
tunde
690de64734
Merge branch 'develop' into issue-9166
2017-06-28 13:37:04 +01:00
tunde
c7e3a09cfb
adds if statement for reference_type === "Asset"
2017-06-28 13:23:18 +01:00
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
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
65ccb42f95
fixed document
2017-06-20 10:21:34 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Rushabh Mehta
80ef298519
[fix] [tests] test_delivery_note
2017-06-20 10:07:28 +05:30
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
tunde
4961072b51
adds the corrected breadcrumbs trail
2017-06-19 13:51:27 +01:00
Makarand Bauskar
9a5c39d329
Merge pull request #9353 from mbauskar/develop
...
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 18:16:22 +05:30
tunde
46db749d62
adds information about "Is Paid" and "Update Stock"
2017-06-19 09:18:57 +01:00
mbauskar
de5a11e8fb
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 13:07:51 +05:30
Sagar Vora
086b6a33ea
Fixed BOM value not updating on changing item ( #9350 )
2017-06-19 12:25:14 +05:30
Sagar Vora
67fe1010c7
[minor] set_posting_time=1 only when imported data contains posting date. ( #9349 )
2017-06-19 12:12:22 +05:30
Rushabh Mehta
b7b49f6da7
[fixes] fix message and type conversion;
2017-06-19 09:59:09 +05:30
Charles-Henri Decultot
2305eda82e
Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification ( #9339 )
2017-06-19 09:25:54 +05:30
Umair Sayed
ac2e32a511
replaced some old images with new, #9262 ( #9335 )
2017-06-19 09:23:04 +05:30
Ben Cornwell-Mott
2c77165fc6
Fixed small code issues (codecy)
2017-06-16 13:47:40 -07:00
Manas Solanki
9936100a6a
send email on update and on update after submit fixes #8898
2017-06-16 22:18:20 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
mbauskar
3c1a53c325
[minor] use reload_doc instead of reload_doctype
2017-06-16 18:31:42 +05:30
Rushabh Mehta
73167eae60
[demo] make it faster, do not send user email
2017-06-16 16:55:32 +05:30
tundebabzy
9a3462031d
[UX] Error in purchase transaction - Ignore instead of Prompt #7766 ( #9329 )
...
* sets tax category to "Total" if all items are non-stock items
* makes notification message translatable and removes multi-line string
* Update buying_controller.py
2017-06-16 15:30:14 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
mbauskar
2ea55c7143
[minor] reload Domain doctype before executing patch
2017-06-16 14:33:59 +05:30
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Sagar Vora
b1c794a4f9
[hot] fix global name args is not defined ( #9326 )
2017-06-16 13:50:35 +05:30
rohitwaghchaure
fb45913b3b
[fix] Patch for move account head from account to warehouse ( #9325 )
2017-06-16 13:12:37 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
Vishal Dhayagude
2510d1c86a
Training Events/Results link added to Employee ( #9313 )
2017-06-16 11:58:08 +05:30
Umair Sayed
5dadb0e19a
created help page for email inbox, fixes #9262 ( #9315 )
2017-06-16 11:57:44 +05:30
Britlog
224eb90199
Fix get_parents context ( #9296 )
2017-06-16 11:51:06 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
Manas Solanki
b07535bb64
bug in training result module ( #9314 )
2017-06-16 11:20:42 +05:30
Rushabh Mehta
c8a0de5e59
Revert "sets tax category to "Total" if all items are non-stock items ( #9295 )" ( #9320 )
...
This reverts commit 476c4fec1d
2017-06-16 11:18:23 +05:30
tundebabzy
476c4fec1d
sets tax category to "Total" if all items are non-stock items ( #9295 )
2017-06-16 11:17:40 +05:30
