Nabin Hait
|
46e108b34e
|
Merge pull request #8166 from nabinhait/pro_order_multi_level_bom_operations
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
|
2017-03-27 21:36:28 +05:30 |
|
Rushabh Mehta
|
fe5c95e360
|
Update CONTRIBUTING.md
|
2017-03-27 20:41:51 +05:30 |
|
Nabin Hait
|
0329c0ffab
|
Test case fixed for production order
|
2017-03-27 19:11:45 +05:30 |
|
Nabin Hait
|
5b60ef2dce
|
Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked
|
2017-03-27 16:29:51 +05:30 |
|
Nabin Hait
|
8bf58367b8
|
Fixed merge conflict
|
2017-03-27 12:30:01 +05:30 |
|
Nabin Hait
|
3e43f275a0
|
Merge branch 'hotfix'
|
2017-03-27 12:27:38 +05:30 |
|
Nabin Hait
|
70c3f79d12
|
bumped to version 7.2.31
|
2017-03-27 12:57:38 +06:00 |
|
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 |
|
Nabin Hait
|
a4f838b6b4
|
Merge pull request #8135 from dottenbr/de_translation_fix
Fix German Translation
|
2017-03-27 12:24:20 +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 |
|
Nabin Hait
|
b40efe34e3
|
Merge pull request #8067 from KanchanChauhan/issue-webview-fixed
[Fix] Issue web view fixed
|
2017-03-23 17:00:47 +05:30 |
|
Nabin Hait
|
691a34c924
|
Merge branch 'develop' into issue-webview-fixed
|
2017-03-23 17:00:30 +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 |
|
Nabin Hait
|
a90ff97782
|
Merge pull request #8096 from frappe/netchampfaris-documentation
Update Workflows
|
2017-03-23 16:15:40 +05:30 |
|
Nabin Hait
|
1775a3db38
|
Merge pull request #8115 from rohitwaghchaure/setup_wizard_unpickle_issue
[fix] UnpickleError, removed _ method from the argument of the function
|
2017-03-23 16:14:52 +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 |
|