Commit Graph

18079 Commits

Author SHA1 Message Date
rohitwaghchaure
afa93c624b [fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203) 2017-03-29 17:29:20 +05:30
Manas Solanki
8519b4bfe4 Changes in Program Enrollment and Report for Student Contact Details (#8176)
* Added the student house name in the program enrollment

* added report for the student contact details

* Enabled tag in Student master and fix in student enrollment tool

* [Fix] School House and Report
2017-03-29 16:07:31 +05:30
Nabin Hait
79731360ed Merge pull request #8126 from kickapoo/issue8094
Add link field Package Code (fixes #8094)
2017-03-28 20:48:39 +05:30
Nabin Hait
fede6d8fbe Updated modified date for production order 2017-03-28 20:42:42 +05:30
Stavros Anastasiadis
b9bbb3c3db Add link field Package Code (fixes #8093) 2017-03-28 16:09:52 +03:00
Nabin Hait
11812db5e8 Merge pull request #8183 from neilLasrado/minor-fix
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 18:08:42 +05:30
Neil Trini Lasrado
193c8919b9 Fixed issue with misleading error message on Stock Entry creation of Serialized Items 2017-03-28 17:43:23 +05:30
Nabin Hait
d1f6cc88f2 Required items table in Production order 2017-03-28 17:08:40 +05:30
Nabin Hait
dac525433c Merge pull request #8178 from nabinhait/develop
Patch order changed for multiple uoms in sales cycle
2017-03-28 16:55:57 +05:30
rohitwaghchaure
e313c09fd7 Merge pull request #8182 from frappe/netchampfaris-patch-1
Update POS screenshot
2017-03-28 16:35:16 +05:30
Faris Ansari
49a3d6d8f6 Update POS screenshot 2017-03-28 16:17:30 +05:30
Nabin Hait
580682d6a2 Merge pull request #8136 from dottenbr/customs_tariff_number
Add Customs Tariff Number
2017-03-28 13:51:52 +05:30
Nabin Hait
6c3eb36c35 Merge branch 'develop' into customs_tariff_number 2017-03-28 13:51:44 +05:30
Nabin Hait
621dcc3c84 Patch order changed for multiple uoms in sales cycle 2017-03-28 13:45:56 +05:30
Nabin Hait
010d9cd796 Merge branch 'dottenbr-manufacturer_childtable' into develop 2017-03-28 13:39:43 +05:30
Nabin Hait
77b2fef41e Fixed test cases 2017-03-28 13:39:26 +05:30
Nabin Hait
d20f8585ae Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable 2017-03-28 13:31:28 +05:30
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