Saurabh
|
011fe48ec3
|
Merge pull request #17823 from abhijitkumbharInd/develop
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:26:08 +05:30 |
|
Saurabh
|
f68bd8f349
|
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
fix: allow import for packing slip
|
2019-05-31 14:24:51 +05:30 |
|
Saurabh
|
b6028b0495
|
Merge pull request #17809 from Alchez/develop-sales-analytics-total
fix(selling): Remove Totals row for Sales Analytics
|
2019-05-31 14:21:01 +05:30 |
|
Saurabh
|
731986d8ee
|
Merge pull request #17811 from nabinhait/pr-expense-account-dev
fix: Added Expense Account field to push value from PO-PR-PI
|
2019-05-31 14:19:47 +05:30 |
|
abhijitkumbharIND
|
39d6cf38fc
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
abhijitkumbharIND
|
302bce355f
|
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
|
2019-05-31 14:19:04 +05:30 |
|
Rohit Waghchaure
|
e98d1c1147
|
fix: allow import for packing slip
|
2019-05-31 14:16:11 +05:30 |
|
Deepesh Garg
|
bd3c60254a
|
Merge pull request #17819 from deepeshgarg007/module
fix: Add chart of accounts importer in data import module
|
2019-05-31 13:33:20 +05:30 |
|
Deepesh Garg
|
25857d6ee3
|
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
fix: Add translations for missing labels in AR report
|
2019-05-31 12:37:36 +05:30 |
|
Saurabh
|
90b60cfb0d
|
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
fix: POS cash mode of payment css
|
2019-05-31 12:29:19 +05:30 |
|
rohitwaghchaure
|
09d8bb8aa9
|
Merge pull request #17822 from rohitwaghchaure/pricing_rule_applying_on_the_non_conditional_item
fix: pricing rule is applying on the incorrect item
|
2019-05-31 12:17:18 +05:30 |
|
Rohit Waghchaure
|
840244c562
|
fix: pricing rule is applying on the incorrect item
|
2019-05-31 12:16:35 +05:30 |
|
deepeshgarg007
|
9f9516597c
|
fix: Add chart of accounts importer in data import module
|
2019-05-31 10:11:46 +05:30 |
|
Rohit Waghchaure
|
4fd704dbb6
|
fix: POS cash mode of payment css
|
2019-05-30 23:25:41 +05:30 |
|
deepeshgarg007
|
480586152b
|
fix: Label translations
|
2019-05-30 22:34:00 +05:30 |
|
deepeshgarg007
|
da2e456f70
|
fix: Add translations for missing labels in AR report
|
2019-05-30 22:30:32 +05:30 |
|
rohitwaghchaure
|
3fa54905a2
|
Merge pull request #17814 from rohitwaghchaure/new_pricing_rule_not_exists_issue
fix: pricing rule not exists issue
|
2019-05-30 22:25:45 +05:30 |
|
Rohit Waghchaure
|
ac8f4b449d
|
fix: pricing rule not exists issue
|
2019-05-30 22:24:24 +05:30 |
|
Nabin Hait
|
0e1e37c921
|
fix: Added Expense Account field to push value from PO-PR-PI
|
2019-05-30 18:13:41 +05:30 |
|
Rohan Bansal
|
250734dd24
|
fix(selling): Remove Totals row for tree-based Sales Analytics
|
2019-05-30 17:30:50 +05:30 |
|
Nabin Hait
|
b6ffaf11fe
|
Merge pull request #17787 from nabinhait/naming-series-chars
fix: Allowed '{' and '}' in naming series
|
2019-05-30 17:25:08 +05:30 |
|
Nabin Hait
|
1bb3fc3c19
|
Merge pull request #17789 from sunnyakaxd/patch-2
fix: Dont fetch all orders to update a few
|
2019-05-30 17:24:49 +05:30 |
|
Deepesh Garg
|
af32ed6d8f
|
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
feat: Product Bundle Balance Report
|
2019-05-30 15:58:25 +05:30 |
|
Saurabh
|
2b40a44429
|
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
feat: Updated translation
|
2019-05-30 15:56:45 +05:30 |
|
Saif Ur Rehman
|
7129231dbb
|
fix(Product Bundle Balance): Update frappe.db.escape for v12
|
2019-05-30 13:55:32 +05:00 |
|
Anurag Mishra
|
62d58acea9
|
fix: Added description if item variants does not have description in map(v12) (#17796)
* fix: variant item description based on attribute
* style: removed unwanted changes
|
2019-05-30 14:04:08 +05:30 |
|
frappe
|
5aeb62f288
|
feat: Updated translation
|
2019-05-30 08:17:59 +00:00 |
|
Deepesh Garg
|
12a9a3ffa3
|
Merge branch 'develop' into Product-Bundle-Balance
|
2019-05-29 18:23:21 +05:30 |
|
Shivam Mishra
|
9944ef2baf
|
Merge pull request #17791 from adityahase/remove-manifest
perf: Remove MANIFEST.in
|
2019-05-29 15:31:35 +05:30 |
|
Aditya Hase
|
960c6138db
|
perf: Remove MANIFEST.in
Faster pip install -e erpnext
https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it
https://github.com/frappe/frappe/pull/7360
|
2019-05-29 15:14:07 +05:30 |
|
Himanshu Mishra
|
70029b818b
|
Update status_updater.py
|
2019-05-29 14:19:35 +05:30 |
|
Nabin Hait
|
f1cde0ccf6
|
fix: Allowed '{' and '}' in naming series
|
2019-05-29 13:44:03 +05:30 |
|
Nabin Hait
|
99f27b94c1
|
Merge pull request #17773 from Anurag810/request_to_quatation_fix
fix: Changed dialog field to Select when we get supplier in request to quotation
|
2019-05-29 09:58:00 +05:30 |
|
Faris Ansari
|
da2c742cea
|
Merge branch 'develop' into request_to_quatation_fix
|
2019-05-28 18:28:13 +05:30 |
|
Faris Ansari
|
dd016479af
|
fix: Remove print statement
|
2019-05-28 18:27:22 +05:30 |
|
Anurag Mishra
|
5afe9f2200
|
fix: changed dialog field to select
|
2019-05-28 18:23:34 +05:30 |
|
Nabin Hait
|
e7b8400fc7
|
Merge pull request #17696 from Anurag810/warehouse_type
feat: Added Warehouse Type master
|
2019-05-28 17:25:13 +05:30 |
|
Nabin Hait
|
5fef786441
|
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
fix: Tax calculation on salary slip
|
2019-05-28 11:16:31 +05:30 |
|
Anurag Mishra
|
a69f72988a
|
fix: requested filters changes
|
2019-05-28 11:08:14 +05:30 |
|
Nabin Hait
|
351e9983cf
|
Merge pull request #17389 from mujeerhashmi/develop
feat: Student Group with Student Category filter
|
2019-05-27 19:14:31 +05:30 |
|
Nabin Hait
|
9813897ec3
|
Merge pull request #17759 from saurabh6790/custom_field_fix
fix: add shopify_supplier_id custom field while setting up shopify
|
2019-05-27 19:12:39 +05:30 |
|
Nabin Hait
|
60f04d181d
|
Merge pull request #17756 from nabinhait/property-decorator
fix(subscription): Remove property decorator (#17395)
|
2019-05-27 19:11:17 +05:30 |
|
Nabin Hait
|
7f375d209c
|
fix: Tax calculation on salary slip
|
2019-05-27 18:42:53 +05:30 |
|
Anurag Mishra
|
32c23ae274
|
fix: added read write permission to stock manager
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
61a7b42aea
|
fix: added permission and fix filters in stock balance report
|
2019-05-27 18:37:04 +05:30 |
|
Anurag Mishra
|
7376b4f4f0
|
feat: added warehouse type master
|
2019-05-27 18:37:04 +05:30 |
|
Nabin Hait
|
1f24a4d44c
|
Merge pull request #17691 from netchampfaris/upload-attendance-progress
fix(UX): Upload Attendance
|
2019-05-27 17:17:03 +05:30 |
|
Nabin Hait
|
e662be7508
|
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
fix: update received qty in PO from PR and PI
|
2019-05-27 17:16:40 +05:30 |
|
Nabin Hait
|
54ea9b0978
|
Merge pull request #17709 from nabinhait/opening-stock-entry-dev
fix: Opening accounting entry for stock entry
|
2019-05-27 17:16:19 +05:30 |
|
Nabin Hait
|
4f549cc196
|
Merge branch 'develop' into opening-stock-entry-dev
|
2019-05-27 17:16:03 +05:30 |
|