Commit Graph

10614 Commits

Author SHA1 Message Date
Nabin Hait
9c8159be8f Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
68fb20b811 Merge pull request #8131 from rohitwaghchaure/purchase_analytics_issue
[fix] Purchase analytics report not loading
2017-03-27 12:24:46 +05:30
Dominik Ottenbreit
fc9ed4da24 Add Customs Tariff Number 2017-03-24 15:53:03 +01:00
Dominik Ottenbreit
ea617da277 fix translations that have to do with term 'close' which was not well translated 2017-03-24 15:24:55 +01:00
Dominik Ottenbreit
6eb202ef3a fix patch after test, fix variant based on manufacturer, add json for item_manufacturer 2017-03-24 14:49:52 +01:00
Dominik Ottenbreit
3938c61996 migrate from manufacturer to manufacturer childtable 2017-03-24 14:24:34 +01:00
Rohit Waghchaure
f74b02140c [fix] Purchase analytics report not loading 2017-03-24 17:37:02 +05:30
Rohit Waghchaure
b719dc53fc [fix] customer edit and numeric keypad visibility issue in the pos 2017-03-24 17:03:50 +05:30
Nabin Hait
00b04ed61e Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Nabin Hait
bf2a7efca4 Account name changed in standard chart of accounts 2017-03-24 13:01:35 +05:30
Nabin Hait
214ea8f2c8 Merge pull request #8119 from robulik/develop
[minor] fixes of translatable strings in web pages
2017-03-24 12:59:02 +05:30
Kanchan Chauhan
a844040781 Show qty in Shopping Cart 2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44 [minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type 2017-03-23 13:43:26 +01:00
Nabin Hait
9ba1be60b7 Merge pull request #8039 from netchampfaris/pos-ui-fix
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
Nabin Hait
2aafdd622b Merge pull request #8047 from KanchanChauhan/warehouse-for-dropship
[Fix] Warehouse not required for Dropship
2017-03-23 17:06:18 +05:30
Nabin Hait
b6b97f25d0 Merge pull request #8048 from KanchanChauhan/bom-based-on-project
Project filter in BOM selection in Production Order
2017-03-23 17:04:53 +05:30
Nabin Hait
4a8a62a202 Merge pull request #8053 from umairsy/video-pages
updated erpnext-learn pages
2017-03-23 17:02:34 +05:30
Nabin Hait
d25e314ccb Merge pull request #8054 from rohitwaghchaure/purchase_return_issue_invoice
[fix] Quantity is not copying in the Received Qty during making of debit note from the purchase invoice
2017-03-23 17:01:58 +05:30
Nabin Hait
f44f04e33a Merge pull request #8063 from khrlzhfr/patch-1
Update standard_chart_of_accounts.py
2017-03-23 17:01:34 +05:30
Robert Kirschner
db068ac6c4 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2017-03-23 12:29:43 +01:00
Nabin Hait
c7dc838306 Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue
[fix] Precision issue during making of depreciation schedule
2017-03-23 16:59:12 +05:30
Nabin Hait
5168286ea0 Merge pull request #8072 from lb-/patch-1
Update the-champion.md - grammar
2017-03-23 16:58:19 +05:30
Nabin Hait
8373b8e50d Merge pull request #8075 from netchampfaris/asset-image-fix
[fix] asset image in image view
2017-03-23 16:58:05 +05:30
Nabin Hait
33f2b659e4 Merge pull request #8079 from robulik/develop
[fix] selecting new address in cart webpage unchecks previously checked
2017-03-23 16:52:39 +05:30
Nabin Hait
8de911b5b4 Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
[Minor] Guest should have read permissions on Job Openings
2017-03-23 16:50:45 +05:30
Robert Kirschner
d162eb367c [minor] fix translation strings in cart web view 2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2017-03-23 12:10:46 +01:00
Nabin Hait
46bccb55c5 Merge pull request #8080 from rmehta/item-variants-by-mfg
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Nabin Hait
422ef584fa Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip
[Minor] From date, To date based on Payroll Frequency
2017-03-23 16:16:51 +05:30
Nabin Hait
b132428184 Merge pull request #8091 from mbauskar/cart-address-fixes
[minor] fixed shipping and billing address issue in cart
2017-03-23 16:16:11 +05:30
Rohit Waghchaure
57f35a25a1 [fix] UnpickleError, removed _ method from the argument of the function 2017-03-23 14:55:52 +05:30
Faris Ansari
3011006ff2 Merge pull request #8097 from frappe/netchampfaris-documentation-1
Add new screenshots for Workflows documentation
2017-03-22 17:50:17 +05:30
Faris Ansari
1e7f739c84 Add new screenshots for Workflows documentation 2017-03-22 17:48:51 +05:30
Faris Ansari
7fbc1c2161 Update Workflows
Add new images
2017-03-22 17:45:52 +05:30
mbauskar
67e3e32dd6 [minor] fixed shipping and billing address issue in cart 2017-03-22 16:14:43 +05:30
Kanchan Chauhan
076e9d6af8 [Minor] From date, To date based on Payroll Frequency 2017-03-22 16:07:03 +05:30
Robert Kirschner
c6b52a321e update on cart.js pull request feedback 2017-03-22 08:10:30 +01:00
Kanchan Chauhan
730ad5a507 [Minor] Guest should have read permissions on Job Openings 2017-03-22 12:37:38 +05:30
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