Commit Graph

24829 Commits

Author SHA1 Message Date
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
815c575a0b Merge branch 'staging-fixes' into staging 2019-01-22 15:45:56 +05:30
Sagar Vora
64d774d178 bumped to version 11.0.3-beta.35 2019-01-22 16:05:56 +05:50
Sagar Vora
ceacacc320 Merge branch 'master' into staging-fixes 2019-01-22 15:37:05 +05:30
Sagar Vora
8c8e4fd130 Merge branch 'hotfix' 2019-01-22 15:33:48 +05:30
Sagar Vora
1e61dd024b bumped to version 10.1.78 2019-01-22 15:53:48 +05:50
Nabin Hait
cdcf474f12
Merge pull request #16447 from adityahase/ars-fix
fix(ar-summary-report): Changes to column list to match recent changes in AR Report
2019-01-22 15:08:46 +05:30
Aditya Hase
d157ae17b7 fix(ar-summary-report): Changes to column list to match recent changes in AR report 2019-01-22 13:37:54 +05:30
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
2019-01-22 10:49:55 +05:30
Nabin Hait
a334ed879f
Update __init__.py 2019-01-22 10:41:50 +05:30
Nabin Hait
9adfd2d7b4
Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring
fix: Project update status feature's code and design refactored
2019-01-22 10:02:34 +05:30
Nabin Hait
b9b8d575bc
Merge pull request #16435 from deepeshgarg007/support-fix
fix(accounts_receivable): Bug fix in accounts receivable report
2019-01-22 09:59:17 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total
fix: Disable rounded total field's value honours docfield's default value
2019-01-22 09:58:06 +05:30
Nabin Hait
16bbf09947
Merge pull request #16440 from rohitwaghchaure/not_able_to_submit_work_order
fix: not able to submit work order
2019-01-22 09:57:49 +05:30
Nabin Hait
0abfcb5516
Merge pull request #16442 from rohitwaghchaure/pos_query_code_cleanup
fix: Code cleanup
2019-01-22 09:56:57 +05:30
Rohit Waghchaure
de718dacb2 fix: Code cleanup 2019-01-21 19:47:17 +05:30
Rohit Waghchaure
11ce45077d [Fix] Not able to submit work order 2019-01-21 19:18:52 +05:30
Nabin Hait
a39f324682 fix: Disable rounded total field's value honours docfield's default value 2019-01-21 18:50:50 +05:30
deepeshgarg007
ff1078f271 fix(minor): fetch payment terms if voucher nos are available 2019-01-21 09:43:56 +05:30
Himanshu
79d4400c16 fix: Offline pos fix (#16424)
* Offline POS fix

* Fixed items search and load items
2019-01-19 14:01:38 +05:30
Aditya Hase
442c85c006 fix(marketplace): Capitalize marketplace factory class to support router changes (#16428) 2019-01-18 21:28:37 +05:30
Rohit Waghchaure
7e71e132a3 Added patch 2019-01-18 11:47:31 +05:30
Nabin Hait
0c44701901
Merge pull request #16375 from deepeshgarg007/company_address
feat: Company address and GST field addition in sales order, purchase order, purchase receipt
2019-01-18 10:57:57 +05:30
Nabin Hait
7bea25a23a
Merge pull request #16415 from ks093/ks093-shopping-cart-fixes
fix: Show stock validation message while placing order and Quotation series field fix in shopping cart settings.
2019-01-18 10:46:24 +05:30
Nabin Hait
6cc2a36c79
Merge pull request #16418 from nabinhait/stock_transfer_inter_company
Fix: Inter company stock transfer for serialised items
2019-01-18 10:45:07 +05:30
Nabin Hait
6202d0ed68 fix: NoneType comparison with int error 2019-01-18 09:40:24 +05:30
Nabin Hait
30667c160d test: Inter company stock transfer for serialised items 2019-01-18 09:36:18 +05:30
Nabin Hait
5a87ac0ad8 fix: Inter company stock transfer for serialised items 2019-01-18 09:36:18 +05:30
Rohit Waghchaure
425dff93d7 fix: Project update status code and design refactored 2019-01-17 19:21:44 +05:30
ks093
61c781325d
Fix to show low stock message.
In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.
2019-01-17 12:16:43 +05:30
ks093
1ed819bb10
Refresh quotation_series field to show series 2019-01-17 12:09:04 +05:30
Nabin Hait
c338188ce2
Merge pull request #16409 from SaiFi0102/Gross-Profit-Return-Fix
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-17 10:56:04 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix 2019-01-16 17:52:30 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address 2019-01-16 17:51:49 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix 2019-01-16 17:49:22 +05:30
Nabin Hait
0e0f7c0d32
Merge pull request #16392 from nabinhait/mr_against_so
fix: Make material request from SO and raw material's rate as per UOM in BOM
2019-01-16 17:47:07 +05:30
Nabin Hait
3dd5f55412 feat(stock-reco): Fetch items in stock reco based on group warehouse 2019-01-16 16:20:05 +05:30
Nabin Hait
78ccbe24a3 fix(test): BOM raw materials rate from price list as per uom 2019-01-16 16:00:25 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Nabin Hait
3dde949419 feat(mr_against_so): Merge same items from different BOMs 2019-01-16 15:59:39 +05:30
Sahil Khan
693e81db48 more bis fixes 2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50 BIS issue fixes 2019-01-16 15:59:39 +05:30
Saif Ur Rehman
fccb1e55ec fix(Gross Profit Report): corrected fieldnames in return invoice query 2019-01-16 14:36:55 +05:00
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address 2019-01-16 11:17:55 +05:30
Nabin Hait
29552c1ec4
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
fix(website): Pagination in child item groups
2019-01-16 10:31:48 +05:30
Nabin Hait
7686aa9ff6
Merge pull request #16400 from Zlash65/fix-deff
fix: for deferred settings for Item
2019-01-16 10:16:00 +05:30
Nabin Hait
7b3ee0e31c
Merge pull request #16403 from saurabh6790/patch_sequnce_fix
Patch sequence fix
2019-01-16 10:15:14 +05:30
Nabin Hait
7213895095
Merge pull request #16404 from Zlash65/fix-asset-category
fix: Asset Category field as link type and read only
2019-01-16 10:14:21 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency
fix: Quotation to Sales Order with different currency
2019-01-16 10:13:44 +05:30
Nabin Hait
d98315c41c
Merge pull request #16402 from sagarvora/fix-patch-testing
fix(tests): change patch order, optimise Travis
2019-01-16 10:13:14 +05:30