Deepesh Garg
|
e95a4053cf
|
Delete sales_order.json
|
2019-01-16 22:53:53 +05:30 |
|
Deepesh Garg
|
e6e1f2a46f
|
Delete __init__.py
|
2019-01-16 22:53:28 +05:30 |
|
Deepesh Garg
|
e4303111b4
|
Delete __init__.py
|
2019-01-16 22:53:00 +05:30 |
|
Deepesh Garg
|
9fb871c040
|
Delete pending_purchase_order.json
|
2019-01-16 22:52:27 +05:30 |
|
Deepesh Garg
|
3f5fea97fa
|
Delete __init__.py
|
2019-01-16 22:52:07 +05:30 |
|
deepeshgarg007
|
12b409b94a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
|
2019-01-16 22:33:17 +05:30 |
|
deepeshgarg007
|
f8bbcc56b7
|
refactor(email_digest): Fixes in email digest links and reports
|
2019-01-16 22:22:48 +05:30 |
|
Nabin Hait
|
c8ac825f0d
|
Merge branch 'hotfix' into leave-application-naming
|
2019-01-16 17:54:35 +05:30 |
|
Nabin Hait
|
873442a55d
|
Merge branch 'staging-fixes' into Party-Ledger-Summary
|
2019-01-16 17:52:45 +05:30 |
|
Nabin Hait
|
983d102a19
|
Merge branch 'staging-fixes' into Quality-inspection-fix
|
2019-01-16 17:52:30 +05:30 |
|
Nabin Hait
|
cd40d87ebd
|
Merge branch 'staging-fixes' into pr_staging_fixes_2
|
2019-01-16 17:52:01 +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
|
38703080c9
|
Merge pull request #16360 from adityahase/demo
fix(demo): Look for "Total" instead of "'Total'" in report results
|
2019-01-16 10:23:59 +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 |
|
Saurabh
|
7d630b3e29
|
Merge branch 'master' into staging-fixes
|
2019-01-15 19:41:09 +05:30 |
|
Saurabh
|
529cc1ca51
|
bumped to version 10.1.77
|
2019-01-15 19:46:36 +06:00 |
|
Nabin Hait
|
d36bc5a9fd
|
Merge pull request #16327 from nabinhait/group_warehouse_stock_reco
Fetch items based on group warehouse in Stock Reconciliation
|
2019-01-15 17:49:07 +05:30 |
|
Rohit Waghchaure
|
affeb3dfec
|
Added on account amount field in Accounts Payable/Receivable Summary
|
2019-01-15 17:38:31 +05:30 |
|
deepeshgarg007
|
7278834d25
|
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
|
2019-01-15 17:02:12 +05:30 |
|
Rohit Waghchaure
|
1a4c1e11cb
|
Fix: total invoiced amount in Accounts Receivable Summary report showing blank
|
2019-01-15 17:01:34 +05:30 |
|
Zlash65
|
cef56b5147
|
fixes asset category field as link type and read only
|
2019-01-15 16:26:58 +05:30 |
|
Rohit Waghchaure
|
b2d08a498b
|
Added bank account field in the payment entry
|
2019-01-15 16:11:29 +05:30 |
|
Zlash65
|
a3dd798bad
|
clean if conditions
|
2019-01-15 16:05:42 +05:30 |
|
Rohit Waghchaure
|
bdee57ca8d
|
Added finance book in trial balance and fixed cost center not working issue in trial balance
|
2019-01-15 15:52:52 +05:30 |
|
Saif Ur Rehman
|
f86123ad5a
|
feat(Party Ledger Summary): Include columns for discount and other adjustments
|
2019-01-15 15:18:43 +05:00 |
|
Sagar Vora
|
876d868fa1
|
fix(tests): change patch order, optimise travis
|
2019-01-15 15:45:33 +05:30 |
|
Rohit Waghchaure
|
df7215dcb2
|
Added supplier name in the tds report
|
2019-01-15 14:48:06 +05:30 |
|
Saurabh
|
68ea608ca8
|
fix: import unicode_literals
|
2019-01-15 14:47:32 +05:30 |
|
Zlash65
|
627be1de51
|
minor fixes for deferred calculations
|
2019-01-15 14:16:50 +05:30 |
|
NahuelOperto
|
9080221d46
|
fix: added test cases
|
2019-01-14 12:12:56 -03:00 |
|
Nabin Hait
|
d92024bb0f
|
Merge branch 'hotfix' into leave-application-naming
|
2019-01-14 20:26:01 +05:30 |
|
Nabin Hait
|
acd7f73d57
|
Merge branch 'hotfix' into group_warehouse_stock_reco
|
2019-01-14 20:25:53 +05:30 |
|
Nabin Hait
|
55c672eefd
|
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
|
2019-01-14 20:25:22 +05:30 |
|
Nabin Hait
|
910a744263
|
Merge pull request #16391 from nabinhait/cc_fix
fix: Travis fix for hotfix branch
|
2019-01-14 20:24:23 +05:30 |
|
Nabin Hait
|
4ed7cfc515
|
tests(cost-center-company): Validate cost center's company and revent tests
|
2019-01-14 17:14:39 +05:30 |
|