Nabin Hait
|
9cce19a65c
|
Merge pull request #17438 from netchampfaris/cart-route
fix(cart): Don't use window.open as it can be blocked
|
2019-05-02 03:17:58 +05:30 |
|
Nabin Hait
|
62fce0a6e5
|
Merge pull request #17432 from netchampfaris/task-depends-on-code
fix: Set depends_on_tasks to Code
|
2019-05-02 03:12:33 +05:30 |
|
Nabin Hait
|
e93702032b
|
Merge branch 'develop' into task-depends-on-code
|
2019-05-02 00:59:23 +05:30 |
|
Nabin Hait
|
bbcf43961c
|
Merge branch 'develop' into cart-route
|
2019-05-02 00:59:13 +05:30 |
|
Nabin Hait
|
7ca243094e
|
Merge branch 'develop' into coa-sorting
|
2019-05-02 00:58:56 +05:30 |
|
Nabin Hait
|
d539def25d
|
Update campaign.json
|
2019-05-02 00:44:29 +05:30 |
|
Nabin Hait
|
9d04b67f46
|
fix: Validate parent account of child company while creating new account based on parent company
|
2019-05-01 20:26:36 +05:30 |
|
Nabin Hait
|
4ee2cec8e2
|
Merge pull request #17444 from nabinhait/work-order-bom-image-dev
feat: Added item image in work order and bom
|
2019-05-01 19:31:15 +05:30 |
|
Nabin Hait
|
9ccdf594c3
|
Merge pull request #17445 from rmehta/refactor-child-tables
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
|
2019-05-01 19:31:00 +05:30 |
|
Nabin Hait
|
64346c08c6
|
Merge pull request #17446 from netchampfaris/product-configurator-skip-disabled-items
fix: Skip disabled items in product configurator
|
2019-05-01 19:27:59 +05:30 |
|
Nabin Hait
|
c64cc331b7
|
Update item_variants_cache.py
|
2019-05-01 19:27:23 +05:30 |
|
Nabin Hait
|
284e5a284e
|
Update item_variants_cache.py
|
2019-05-01 19:26:56 +05:30 |
|
Deepesh Garg
|
a475ddc4b9
|
Merge pull request #17437 from deepeshgarg007/rename_report_develop
fix: Rename Inactive Items report to Inactive Sales Items
|
2019-05-01 19:24:59 +05:30 |
|
Nabin Hait
|
240008d7c6
|
fix: Multilingual handling in woocommerce integration
|
2019-05-01 19:18:40 +05:30 |
|
Faris Ansari
|
4ca948d7ea
|
fix: Skip disabled items in product configurator
|
2019-05-01 18:19:24 +05:30 |
|
deepeshgarg007
|
1cfe96193f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop
|
2019-05-01 18:14:07 +05:30 |
|
deepeshgarg007
|
75afff2f6d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
|
2019-05-01 18:05:11 +05:30 |
|
Rushabh Mehta
|
c3aecb1fbd
|
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
|
2019-05-01 18:04:22 +05:30 |
|
deepeshgarg007
|
c5e6886937
|
feat: Notification for material request receipt
|
2019-05-01 18:03:40 +05:30 |
|
Nabin Hait
|
621006642c
|
feat: Added item image in work order and bom
|
2019-05-01 17:20:21 +05:30 |
|
Nabin Hait
|
dc86bc756e
|
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
fix: Always fetch exchange rate from ref document
|
2019-05-01 17:18:35 +05:30 |
|
Aditya Hase
|
8b8e3e7890
|
Merge pull request #17424 from adityahase/fix-py3-misc
fix: Python 3 compatibility fixes
|
2019-05-01 16:45:11 +05:30 |
|
deepeshgarg007
|
bffa060ff6
|
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
|
2019-05-01 16:33:11 +05:30 |
|
Nabin Hait
|
6d9334810e
|
fix: reverted fetch from as the field does not exists for some ref doctypes
|
2019-05-01 15:40:00 +05:30 |
|
Nabin Hait
|
3191d072f0
|
fix: Always fetch exchange rate from ref document
|
2019-05-01 15:37:03 +05:30 |
|
Nabin Hait
|
0af45b41d7
|
Merge pull request #17426 from adityahase/fix-py3-regional-france
fix(py3): Undefined variable
|
2019-05-01 15:05:24 +05:30 |
|
Nabin Hait
|
41423815a7
|
Merge pull request #17431 from nabinhait/deferred-accounting-long-job-dev
fix: moved deferred accounting monthly job to long job
|
2019-05-01 15:04:12 +05:30 |
|
Faris Ansari
|
358329d7df
|
fix: Hide button and cart after success
|
2019-05-01 14:56:50 +05:30 |
|
Faris Ansari
|
5f1eebec16
|
fix(cart): Don't use window.open as it can be blocked
window.open calls are interpreted as popups by some browsers and are
blocked.
Also, route to Quotation web view instead of printview.
|
2019-05-01 14:32:15 +05:30 |
|
Nabin Hait
|
89b06132cd
|
minor fix
|
2019-05-01 14:20:08 +05:30 |
|
Nabin Hait
|
10dae5d3c3
|
fix: Set GST Category fieldtype as Select in invoice
|
2019-05-01 14:18:37 +05:30 |
|
deepeshgarg007
|
6dfbd2bb64
|
fix: Delete old report
|
2019-05-01 14:17:16 +05:30 |
|
deepeshgarg007
|
db999e293b
|
fix: Rename Inactive Items report to Inactive Sales Item
|
2019-05-01 14:06:06 +05:30 |
|
Rushabh Mehta
|
43958dcd11
|
fix(minor): chart of accounts sorting and message
|
2019-05-01 13:53:05 +05:30 |
|
Nabin Hait
|
cc6ee8e16e
|
Merge pull request #17154 from nabinhait/item-discount
fix: Calculate rate based on discount on server side, only if not rate or pricing rule applied
|
2019-05-01 13:44:21 +05:30 |
|
Nabin Hait
|
4c724dc3cb
|
Merge pull request #17428 from nabinhait/ss-fixes-dev
Few fixes in payroll
|
2019-05-01 13:44:05 +05:30 |
|
Nabin Hait
|
991b95fbec
|
Merge pull request #17434 from nabinhait/payment-entry-exchange-rate-dev1
fix: Fetch exchange rate from invoice on server side
|
2019-05-01 13:35:12 +05:30 |
|
Nabin Hait
|
316c3b3f9d
|
fix: Fetch exchange rate from invoice on server side
|
2019-05-01 13:34:17 +05:30 |
|
Faris Ansari
|
7899412d9e
|
fix: Set depends_on_tasks to Code
It tracks a list of dependent tasks which can exceed 140 characters
|
2019-05-01 13:31:56 +05:30 |
|
Nabin Hait
|
b9b2a06847
|
moved deferred accounting monthly job to long job
|
2019-05-01 12:50:23 +05:30 |
|
rohitwaghchaure
|
6687c5a9fc
|
Merge pull request #17427 from adityahase/fix-py3-asset-value-adjustment
fix(py3): Undefined variable
|
2019-05-01 12:25:33 +05:30 |
|
Nabin Hait
|
b8103ac077
|
Merge branch 'develop' into item-discount
|
2019-05-01 12:23:30 +05:30 |
|
Nabin Hait
|
5762a5d8b6
|
fix: Null handling
|
2019-05-01 12:17:55 +05:30 |
|
Nabin Hait
|
a08bf7ef86
|
fix: a few fixes in payroll
|
2019-05-01 12:17:47 +05:30 |
|
Aditya Hase
|
e7d712934f
|
Merge branch 'develop' into fix-py3-asset-value-adjustment
|
2019-05-01 11:55:35 +05:30 |
|
Aditya Hase
|
5bbff9de6c
|
Merge branch 'develop' into fix-py3-regional-france
|
2019-05-01 11:55:32 +05:30 |
|
Aditya Hase
|
ee0093c593
|
Merge branch 'develop' into fix-py3-misc
|
2019-05-01 11:55:28 +05:30 |
|
Aditya Hase
|
234d35781c
|
fix: Python 3 compatibility fixes
import reduce from functools
Undefined variable
|
2019-05-01 11:52:37 +05:30 |
|
Aditya Hase
|
1db334317d
|
fix(py3): Undefined variable
|
2019-05-01 11:51:04 +05:30 |
|
Aditya Hase
|
97ad454525
|
fix(py3): Undefined variable
|
2019-05-01 11:50:05 +05:30 |
|