Himanshu
|
5cf12a4640
|
fix(Purchase Order): fetch payment terms (#17121)
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
|
2019-05-04 22:37:35 +05:30 |
|
Himanshu Warekar
|
24442af9ae
|
fix: use list comprehension
|
2019-05-04 22:35:52 +05:30 |
|
Himanshu Warekar
|
fbed6a12d5
|
fix: calculate percentage only if sales team exist
|
2019-05-04 22:35:52 +05:30 |
|
Himanshu Warekar
|
40b99e3347
|
fix: sales percentage equal to 100
|
2019-05-04 22:35:52 +05:30 |
|
Himanshu Warekar
|
5ca977a41c
|
fix: python side validation
|
2019-05-04 22:35:52 +05:30 |
|
Himanshu Warekar
|
76eddcc29f
|
fix: validate percentage total
|
2019-05-04 22:35:52 +05:30 |
|
Rushabh Mehta
|
78827d8d79
|
Merge pull request #17484 from rmehta/fix-demo-style
fix(style): demo home page
|
2019-05-04 11:10:06 +05:30 |
|
Rushabh Mehta
|
2df16b1f9b
|
fix(style): demo home page
|
2019-05-04 11:09:19 +05:30 |
|
Mangesh-Khairnar
|
e003cc8812
|
fix: filter out completed purchase receipt
|
2019-05-03 16:41:04 +05:30 |
|
Mangesh-Khairnar
|
13d393247a
|
feat: add date range filters
|
2019-05-03 16:00:02 +05:30 |
|
Anurag Mishra
|
d0cdb4a1e9
|
feat: subcontracting report
|
2019-05-03 14:05:29 +05:30 |
|
Faris Ansari
|
ab14892fc5
|
fix: Variant naming if optional attributes
|
2019-05-03 13:57:20 +05:30 |
|
Faris Ansari
|
cb03bb1c00
|
fix: Allow variant attributes to be optional
|
2019-05-03 13:41:50 +05:30 |
|
Himanshu Warekar
|
00a494f07b
|
fix: change sla on priority
|
2019-05-03 12:44:35 +05:30 |
|
Deepesh Garg
|
8ca3df7aac
|
Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop
fix: Inactive sales items report fix
|
2019-05-03 11:54:05 +05:30 |
|
deepeshgarg007
|
3c1b9aa77b
|
fix: Remove patch
|
2019-05-03 09:47:38 +05:30 |
|
Nabin Hait
|
f13abe8332
|
Merge pull request #17464 from Mangesh-Khairnar/task-unlink
feat: unlink task from project on task deletion
|
2019-05-03 09:20:34 +05:30 |
|
deepeshgarg007
|
6c6b24011f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop
|
2019-05-02 23:03:59 +05:30 |
|
Nabin Hait
|
ae0e1da091
|
Merge pull request #17461 from nabinhait/project-billing-summary-dev
refactor: Project and billing summary
|
2019-05-02 21:48:28 +05:30 |
|
Faris Ansari
|
b9dc4687dc
|
fix: Remove parens
|
2019-05-02 20:14:16 +05:30 |
|
deepeshgarg007
|
9ae112bbfc
|
fix: Inactive items report fix
|
2019-05-02 19:38:15 +05:30 |
|
Mangesh-Khairnar
|
ffd4990a70
|
feat: unlink task from project on task deletion
|
2019-05-02 19:19:03 +05:30 |
|
Nabin Hait
|
73041269e9
|
refactor: Project and billing summary
|
2019-05-02 18:13:31 +05:30 |
|
Nabin Hait
|
bd0d10f82a
|
Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev
fix: Multilingual handling in woocommerce integration
|
2019-05-02 12:57:34 +05:30 |
|
Nabin Hait
|
218d551c99
|
Merge pull request #17105 from nabinhait/gst-category-fieldtype
fix: Set GST Category fieldtype as Select in invoice
|
2019-05-02 12:43:09 +05:30 |
|
Nabin Hait
|
e1de2d64e5
|
Merge pull request #17450 from nabinhait/auto-account-creation-company-tree-dev
fix: Validate parent account of child company while creating new account based on parent company
|
2019-05-02 12:40:46 +05:30 |
|
Saurabh
|
7c5d3873fe
|
Merge branch 'develop' into auto-account-creation-company-tree-dev
|
2019-05-02 12:01:46 +05:30 |
|
Nabin Hait
|
5a7c5bc4dd
|
Merge pull request #17435 from rmehta/coa-sorting
fix(minor): chart of accounts sorting and message
|
2019-05-02 11:57:08 +05:30 |
|
Saurabh
|
321c0feed8
|
Merge branch 'develop' into woocommerce-multilingual-fix-dev
|
2019-05-02 11:46:53 +05:30 |
|
Rushabh Mehta
|
27a30c842d
|
fix: simplify sort condition
|
2019-05-02 09:23:56 +05:30 |
|
Nabin Hait
|
3d64a5da5e
|
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
feat: Additional fields in campaign
|
2019-05-02 03:18:22 +05:30 |
|
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 |
|