Rushabh Mehta
|
43583d6497
|
Update item.js
|
2017-03-21 17:49:53 +01:00 |
|
Rushabh Mehta
|
a07c43fd68
|
[feature] ability to have variants based on manufacturer
|
2017-03-21 17:48:34 +01:00 |
|
Robert Kirschner
|
0a33d4ffc5
|
[fix] selecting new address in cart web page unchecks previously checked address
|
2017-03-21 14:52:59 +01:00 |
|
Rohit Waghchaure
|
6ee91ec9c6
|
on selection of row highlight the background in the cart
|
2017-03-21 15:55:09 +05:30 |
|
Faris Ansari
|
e1acb766ac
|
[fix] asset image in image view
|
2017-03-21 14:18:30 +05:30 |
|
LB (Ben Johnston)
|
71f4fbf467
|
Update the-champion.md - grammar
|
2017-03-21 12:50:17 +07:00 |
|
Rohit Waghchaure
|
b69d311268
|
[fix] precision issue during making of depreciation schedule
|
2017-03-20 16:30:34 +05:30 |
|
Khairil Zhafri
|
4d6d456a0d
|
Update standard_chart_of_accounts.py
Minor spelling edits
|
2017-03-20 00:15:34 +08:00 |
|
Rohit Waghchaure
|
414c0ab3bb
|
[fix] Quantity is not copying in the Received Qty during making of debit note
|
2017-03-17 17:19:17 +05:30 |
|
Umair Sayyed
|
024896d806
|
updated erpnext-learn pages
|
2017-03-17 12:55:01 +05:30 |
|
rohitwaghchaure
|
2b9c95a940
|
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
|
2017-03-16 17:56:20 +05:30 |
|
Kanchan Chauhan
|
7cf1a1d84b
|
Project filter in BOM selection in Production Order
|
2017-03-16 17:09:37 +05:30 |
|
Kanchan Chauhan
|
6f7457a1b0
|
[Fix] Warehouse not required for Dropship
|
2017-03-16 16:03:41 +05:30 |
|
Rohit Waghchaure
|
75177c0e35
|
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
|
2017-03-16 15:47:25 +05:30 |
|
Faris Ansari
|
d79f239001
|
[pos] ui fix for small screens frappe/erpnext#8029
|
2017-03-16 12:18:35 +05:30 |
|
mbauskar
|
27efc91db0
|
[minor] make item code mandatory if update_stock is selected
|
2017-03-15 18:57:18 +05:30 |
|
Manas Solanki
|
ad2dc2c747
|
[Fix] Enrolling the student
|
2017-03-15 18:22:57 +05:30 |
|
Rushabh Mehta
|
f340e19ea7
|
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
|
2017-03-15 15:12:43 +05:30 |
|
Nabin Hait
|
56f650f342
|
Merge branch 'master' into develop
|
2017-03-15 11:28:07 +05:30 |
|
Nabin Hait
|
1157ee365b
|
bumped to version 7.2.30
|
2017-03-15 11:58:06 +06:00 |
|
Nabin Hait
|
ee7b4f2882
|
Merge pull request #8016 from rmehta/posting-date-option
[feature] posting date, time is always current unless explicitly set
|
2017-03-15 11:22:04 +05:30 |
|
Nabin Hait
|
505ed25f10
|
Merge pull request #8017 from nabinhait/develop
Field order changed for 'Qty as per Stock UOM'
|
2017-03-14 22:39:36 +05:30 |
|
Nabin Hait
|
1ba71a0b3a
|
Merge pull request #8018 from mbauskar/develop
[minor] custom script to create issue, lead, opportunity from email
|
2017-03-14 22:39:26 +05:30 |
|
Nabin Hait
|
79bce2a71d
|
Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue
[fix] User sales one serial number multiple time from the POS
|
2017-03-14 22:38:28 +05:30 |
|
Rushabh Mehta
|
4f3da42b75
|
[fixes] for tests
|
2017-03-14 21:29:55 +05:30 |
|
Rushabh Mehta
|
131866a11a
|
[fixes] for tests
|
2017-03-14 21:06:15 +05:30 |
|
Rushabh Mehta
|
82c258948d
|
[fixes] for recurring and tests
|
2017-03-14 19:13:39 +05:30 |
|
Rohit Waghchaure
|
e259a9b068
|
[fix] User sales one serial number multiple time from the POS
|
2017-03-14 19:05:21 +05:30 |
|
mbauskar
|
f54b1047b8
|
[minor] custom script to create issue, lead, opportunity from email
|
2017-03-14 17:57:47 +05:30 |
|
Nabin Hait
|
3d731df7e3
|
Field order changed for 'Qty as per Stock UOM'
|
2017-03-14 17:24:57 +05:30 |
|
Rushabh Mehta
|
f6dee248ee
|
Update company.json
|
2017-03-14 17:10:01 +05:30 |
|
Rushabh Mehta
|
6d4a52562b
|
[fix] posting date, time is always current unless explicitly set
|
2017-03-14 17:06:51 +05:30 |
|
Rushabh Mehta
|
6b53792aea
|
[fix] posting date, time is always current unless explicitly set
|
2017-03-14 17:06:51 +05:30 |
|
Rohit Waghchaure
|
faedf8274c
|
[fix] gross profit permission issue
|
2017-03-14 14:56:24 +05:30 |
|
Nabin Hait
|
6a053a989e
|
Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
|
2017-03-14 14:46:48 +05:30 |
|
Saurabh
|
0d47d51407
|
[fix] modified payment request to cope with new payment structure (#7957)
* [fix] modified payment request to cope with new payment structure
* [fix] moved payment gateway doctype from accounts to core
|
2017-03-14 14:46:05 +05:30 |
|
Rohit Waghchaure
|
11fa7a9311
|
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
|
2017-03-14 13:26:10 +05:30 |
|
Manas Solanki
|
2922660b34
|
[Fix] Student attendance tool- Handling double-click on button
|
2017-03-14 12:50:58 +05:30 |
|
rohitwaghchaure
|
27e86201fc
|
Merge pull request #8007 from rohitwaghchaure/pos_profile_issue
[fix] Value assignment issue for country field in pos profile
|
2017-03-14 00:22:23 +05:30 |
|
Rohit Waghchaure
|
cc034a8983
|
[fix] Value assignment issue for country in the pos profile
|
2017-03-13 22:44:48 +05:30 |
|
rohitwaghchaure
|
0216f6e6eb
|
Merge pull request #7995 from saurabh6790/restrict_negative_qty_in_pr
[fix] validate negative quantity while creating purchase receipt
|
2017-03-13 18:24:24 +05:30 |
|
Nabin Hait
|
26ed675240
|
Merge pull request #7996 from netchampfaris/ui-fixes
[ui] show assignees in gantt popup frappe/erpnext#6916
|
2017-03-13 17:22:56 +05:30 |
|
Saurabh
|
4f4d0a8369
|
[fix] validate negative quantity while creating purchase receipt
|
2017-03-13 15:37:47 +05:30 |
|
Faris Ansari
|
df65d21225
|
[ui] show assignees in gantt popup frappe/erpnext#6916
|
2017-03-13 14:52:56 +05:30 |
|
Nabin Hait
|
86cb0cc010
|
Merge pull request #7991 from mbauskar/develop
[minor] display campaign field only if source is Campaign
|
2017-03-13 11:19:59 +05:30 |
|
mbauskar
|
7f42e90832
|
[minor] display campaign field only if source is Campaign
|
2017-03-12 21:57:52 +05:30 |
|
Nabin Hait
|
1ed8bc4c36
|
Gross Profit report: Consider Sales team table only if grouped by sales person
|
2017-03-12 17:10:41 +05:30 |
|
Nabin Hait
|
b2a8482cc5
|
In Student Sibling table, the current student id should not appear as sibling.
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
fb4b8d926f
|
Company based on exising company fix
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
ae205f878a
|
Set default taxes and charges while creating quotation from opportunity
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
d0d22ff203
|
copy letter head from invoice to payment entry
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
6923397ef6
|
Show net total in salary slip log in Process Payroll. Fixed #7986
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
c5204f56e2
|
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
JV on submitting Employee Loan
|
2017-03-12 16:50:48 +05:30 |
|
Nabin Hait
|
132193309c
|
Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
Multiple Salary Fixes
|
2017-03-12 16:48:11 +05:30 |
|
Nabin Hait
|
d402829d17
|
Merge pull request #7980 from rohitwaghchaure/target_bounty_redesign
[Enhancement] POS Redesign and new features
|
2017-03-12 16:47:26 +05:30 |
|
Nabin Hait
|
fd9b2467d6
|
Merge pull request #7966 from rohitwaghchaure/item_variant_issue_for_nuermic
[Fix] Item variants broken when using naming series for items and vriants of numeric value
|
2017-03-12 16:34:40 +05:30 |
|
mbauskar
|
124cf14429
|
[minor] ignore lead addresses delete query if address against lead not found
|
2017-03-11 16:02:20 +05:30 |
|
Rohit Waghchaure
|
0169341917
|
[Fix] Item variants broken when using naming series for items and vriants of numeric value
|
2017-03-10 19:40:08 +05:30 |
|
Rohit Waghchaure
|
87fa59a710
|
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
|
2017-03-10 19:37:02 +05:30 |
|
Faris Ansari
|
1fe1518398
|
[pos] ui cleanup
|
2017-03-10 17:00:43 +05:30 |
|
Rohit Waghchaure
|
6068aecc2e
|
minor fix
|
2017-03-10 17:00:43 +05:30 |
|
Faris Ansari
|
07c9f35779
|
ui cleanup
|
2017-03-10 17:00:42 +05:30 |
|
Faris Ansari
|
45510109b6
|
[pos] cleanup
|
2017-03-10 17:00:42 +05:30 |
|
Rohit Waghchaure
|
017f5005e0
|
fixed pos numeric keypad functionality
|
2017-03-10 17:00:42 +05:30 |
|
Faris Ansari
|
339d9c954a
|
minor changes
|
2017-03-10 17:00:42 +05:30 |
|
Rohit Waghchaure
|
1312fe31a9
|
Provision to edit customer and address details
|
2017-03-10 17:00:42 +05:30 |
|
Faris Ansari
|
adcb3c62fa
|
wip
|
2017-03-10 17:00:42 +05:30 |
|
Rohit Waghchaure
|
3b5a412a9c
|
offline email for POS
|
2017-03-10 17:00:41 +05:30 |
|
Rohit Waghchaure
|
56a7974b58
|
added event on numeric keypad
|
2017-03-10 17:00:41 +05:30 |
|
Rohit Waghchaure
|
86ab6a93b4
|
[Enhancement] POS, numeric keypad
|
2017-03-10 17:00:41 +05:30 |
|
Faris Ansari
|
1f261a8695
|
UI changes
|
2017-03-10 17:00:41 +05:30 |
|
Rohit Waghchaure
|
b5097ec161
|
offline email for POS
|
2017-03-10 17:00:41 +05:30 |
|
Rohit Waghchaure
|
f0c7ba4b1f
|
added event on numeric keypad
|
2017-03-10 17:00:40 +05:30 |
|
Rohit Waghchaure
|
e30f83a8af
|
[Enhancement] POS, numeric keypad
|
2017-03-10 17:00:40 +05:30 |
|
Rushabh Mehta
|
83aa5ee3df
|
[messages] cleanup
|
2017-03-10 12:47:29 +05:30 |
|
Rushabh Mehta
|
db206f2d10
|
[minor] develop_version
|
2017-03-10 09:39:31 +05:30 |
|
Rushabh Mehta
|
868bb26e24
|
[sample] add help for sample tasks and make them into notifications
|
2017-03-09 18:11:11 +05:30 |
|
Kanchan Chauhan
|
37a57813fa
|
Multiple Salary Fixes
|
2017-03-09 13:00:35 +05:30 |
|
Rushabh Mehta
|
aea1c2a1e3
|
[minor] allow sales order delivery date before order date
|
2017-03-09 12:46:51 +05:30 |
|
Kanchan Chauhan
|
ffd1f112e6
|
JV on submitting Employee Loan
|
2017-03-09 12:21:37 +05:30 |
|
Nabin Hait
|
733855a4c3
|
Merge pull request #7956 from manassolanki/sibling
[Fixes] School
|
2017-03-09 11:04:38 +05:30 |
|
Nabin Hait
|
d22bb682a5
|
Merge pull request #7960 from rohitwaghchaure/material_request_issue_for_po
[Fix] Material Request to Production Order not working
|
2017-03-09 10:57:26 +05:30 |
|
Nabin Hait
|
f73a44aa8d
|
Update material_request.py
|
2017-03-09 10:57:00 +05:30 |
|
Rohit Waghchaure
|
02fb5880fe
|
[Fix] Material Request to Production Order not working
|
2017-03-08 18:38:12 +05:30 |
|
Kanchan Chauhan
|
a64f53801b
|
[Minor] Label change in Expense Claim
|
2017-03-08 16:59:49 +05:30 |
|
Manas Solanki
|
631fab012f
|
[Fix] Student attendance tool
|
2017-03-08 14:44:52 +05:30 |
|
Manas Solanki
|
d41836b386
|
[Fix] Student Sibling
|
2017-03-08 14:44:52 +05:30 |
|
Nabin Hait
|
52daaca885
|
Fixed merge conflict
|
2017-03-08 14:30:38 +05:30 |
|
Nabin Hait
|
27c4fdc2df
|
bumped to version 7.2.29
|
2017-03-08 15:00:12 +06:00 |
|
Nabin Hait
|
804c4fc4a7
|
Merge pull request #7951 from rohitwaghchaure/purchase_return_issue
[Fix] Purchase return issue
|
2017-03-08 14:28:55 +05:30 |
|
mbauskar
|
02198ec8b0
|
removed the test_clear_blank_rows test case from JE
|
2017-03-08 12:34:36 +05:30 |
|
Rushabh Mehta
|
b9cdb05934
|
[minor] renamed portal hook
|
2017-03-08 12:34:03 +05:30 |
|
Nabin Hait
|
33fb6ae323
|
Fixed merge conflict
|
2017-03-08 11:18:15 +05:30 |
|
Nabin Hait
|
f967206523
|
bumped to version 7.2.28
|
2017-03-08 11:46:00 +06:00 |
|
Rohit Waghchaure
|
d05a8737f9
|
[Fix] Purchase return issue
|
2017-03-08 10:30:23 +05:30 |
|
Nabin Hait
|
1af471a16f
|
Merge pull request #7938 from netchampfaris/task-list
[gantt] show task project in popup
|
2017-03-07 19:41:52 +05:30 |
|
Nabin Hait
|
f822b875ba
|
Merge pull request #7941 from nabinhait/v8_fixes
Set new name in warehouse_name on rename of warehosue
|
2017-03-07 17:16:44 +05:30 |
|
Nabin Hait
|
961bdc3743
|
Set new name in warehouse_name on rename of warehosue
|
2017-03-07 15:02:34 +05:30 |
|
Abdulla P I
|
cbe035b08a
|
Only enabled user to be fetched
|
2017-03-07 13:34:08 +05:30 |
|
Faris Ansari
|
0e4b924f59
|
[gantt] show task project in popup
|
2017-03-07 12:01:39 +05:30 |
|
mbauskar
|
c03f275e7a
|
[minor] allowed the credit and debit amount to be 0 in JE
|
2017-03-07 11:59:55 +05:30 |
|
Nabin Hait
|
f5a9c8ecf2
|
Merge pull request #7936 from rohitwaghchaure/financial_statement_issue
Minor fix
|
2017-03-07 00:27:53 +05:30 |
|
Rohit Waghchaure
|
9f4317e9b8
|
minor fix
|
2017-03-06 23:42:45 +05:30 |
|
Rohit Waghchaure
|
0bb434af3f
|
minor fix in patch
|
2017-03-06 18:52:34 +05:30 |
|
Nabin Hait
|
b3ffd6b282
|
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
Changed userrole to has role, commonify role editor of the user
|
2017-03-06 18:44:53 +05:30 |
|
Nabin Hait
|
fe876c0805
|
Test case fixed for multiple uom in selling
|
2017-03-06 16:41:13 +05:30 |
|
Nabin Hait
|
e68f32cf19
|
UOM Conversion in selling
|
2017-03-06 16:41:13 +05:30 |
|
Kanchan Chauhan
|
5a980ac87a
|
UOM Conversion in Selling
|
2017-03-06 16:41:12 +05:30 |
|
Nabin Hait
|
0697d62603
|
Merge pull request #7931 from KanchanChauhan/job-applicant-fix
[Fix] Candidate can apply to multiple jobs
|
2017-03-06 16:38:00 +05:30 |
|
Rohit Waghchaure
|
611a70a12a
|
changes in the report roles
|
2017-03-06 16:36:46 +05:30 |
|
Kanchan Chauhan
|
8411be7720
|
[Fix] Candidate can apply to multiple jobs
|
2017-03-06 14:40:43 +05:30 |
|
Rohit Waghchaure
|
e7485150a1
|
added roles in the report
|
2017-03-06 14:26:09 +05:30 |
|
Rohit Waghchaure
|
312498060f
|
changed doctype name userrole to has role
|
2017-03-06 14:24:39 +05:30 |
|
Rohit Waghchaure
|
d59f8b32cd
|
changed user_roles to roles
|
2017-03-06 14:24:39 +05:30 |
|
S. Vigneux
|
ff2d5d8ad9
|
Update batch.md
The practice=> The practice
|
2017-03-05 12:44:03 -05:00 |
|
Nabin Hait
|
a07c3193cf
|
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-04 18:32:40 +05:30 |
|
Rohit Waghchaure
|
a31ffbc745
|
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-03 16:28:49 +05:30 |
|
Rohit Waghchaure
|
f8aa6ed46b
|
removed fiscal year and month from the print
|
2017-03-02 17:51:15 +05:30 |
|
mbauskar
|
91c6ffde86
|
[minor] fixes contact field set query for opportunity
|
2017-03-02 17:29:16 +05:30 |
|
Nabin Hait
|
78a650062c
|
Update company.json
|
2017-03-02 14:48:49 +05:30 |
|
Nabin Hait
|
57a47a83a0
|
Merge pull request #7887 from rohitwaghchaure/capacity_planning
[Fix] Pull operation on production order, when making from sales order
|
2017-03-02 14:17:09 +05:30 |
|
Nabin Hait
|
a0fb3e5128
|
Merge pull request #7888 from KanchanChauhan/payroll-fix
[Fix] JV entry for Employee Loan only if Loan exists
|
2017-03-02 14:15:59 +05:30 |
|
Nabin Hait
|
42bc399f2a
|
Merge pull request #7890 from KanchanChauhan/hr-page
[Minor] Employee Loan Management moved up in HR Page
|
2017-03-02 14:14:04 +05:30 |
|
Nabin Hait
|
bc10ea897d
|
Merge pull request #7893 from pratu16x7/crm-docs
CRM docs update
|
2017-03-02 14:13:19 +05:30 |
|
Kanchan Chauhan
|
cfb0adff98
|
[Minor] Removed Paid status from Salary Slip
|
2017-03-02 12:59:35 +05:30 |
|
Nabin Hait
|
834d616c60
|
Merge branch 'master' into develop
|
2017-03-02 12:38:15 +05:30 |
|
Nabin Hait
|
1cc7024cb4
|
bumped to version 7.2.27
|
2017-03-02 13:08:14 +06:00 |
|
Rushabh Mehta
|
7067ff026a
|
[minor] add progress in desktop help message
|
2017-03-02 11:14:09 +05:30 |
|
Rushabh Mehta
|
e7900b24a0
|
[minor] add progress in desktop help message
|
2017-03-02 11:13:18 +05:30 |
|
Saurabh
|
b3134d34fa
|
[fix] add from date field to salary structure in setup demo data
|
2017-03-02 08:43:08 +05:30 |
|
Nabin Hait
|
258c8199fb
|
Merge pull request #7842 from superlack/develop
Add Sales Orders to Project costing and billing section
|
2017-03-01 17:20:23 +05:30 |
|
pratu16x7
|
4e71337f3d
|
fix lead, customer, opportunity pages
|
2017-03-01 04:02:50 +05:30 |
|
Nabin Hait
|
18b7364a81
|
Merge branch 'master' into develop
|
2017-02-28 18:56:26 +05:30 |
|
Nabin Hait
|
db2aefa3a6
|
bumped to version 7.2.26
|
2017-02-28 19:26:25 +06:00 |
|
Rushabh Mehta
|
f8b19e07cf
|
[minor] activation messages only for non activated users
|
2017-02-28 18:54:07 +05:30 |
|
Kanchan Chauhan
|
639eebdae5
|
[Minor] Employee Loan Management moved up in HR Page
|
2017-02-28 18:01:07 +05:30 |
|
Kanchan Chauhan
|
e6254b96c4
|
[Fix] JV entry for Loan only if Loan exists
|
2017-02-28 17:42:09 +05:30 |
|
Rohit Waghchaure
|
2c2ce8c557
|
[Fix] Pull operation on production order, when making from sales order
|
2017-02-28 17:12:18 +05:30 |
|
Nabin Hait
|
6bbf141d57
|
Merge branch 'develop' into link_mrs
|
2017-02-28 15:55:35 +05:30 |
|
Nabin Hait
|
38c7ad2c69
|
Update supplier_quotation.json
|
2017-02-28 15:53:10 +05:30 |
|
Nabin Hait
|
491d2ad140
|
Update request_for_quotation.json
|
2017-02-28 15:52:43 +05:30 |
|
Nabin Hait
|
365ed5dea9
|
Update purchase_order.json
|
2017-02-28 15:51:00 +05:30 |
|
Nabin Hait
|
fd37395995
|
Merge pull request #7878 from netchampfaris/lead-fix
fix date compare in contact_date
|
2017-02-28 15:37:42 +05:30 |
|
Faris Ansari
|
0ded707397
|
fix date compare in contact_date
|
2017-02-27 21:51:46 +05:30 |
|
superlack
|
62d7ba0afd
|
Update project.py
|
2017-02-27 07:00:30 -08:00 |
|
Nabin Hait
|
cda28ceeec
|
[translations]
|
2017-02-27 17:46:47 +05:30 |
|
Nabin Hait
|
409062b8a4
|
Merge pull request #7869 from KanchanChauhan/dependent-tasks
Dependent task dates gets updated with parent dates
|
2017-02-27 17:34:09 +05:30 |
|
Nabin Hait
|
631ecad985
|
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
[Fix] Multiple fixes in Employee Loan
|
2017-02-27 17:28:20 +05:30 |
|
Nabin Hait
|
3ddc26060a
|
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
[Fix] Update totals on salary component deletion
|
2017-02-27 17:26:39 +05:30 |
|
Kanchan Chauhan
|
c02745c826
|
[Fix] Update totals on salary component deletion
|
2017-02-27 17:21:41 +05:30 |
|