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
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
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +05:30
Mitchy25
a8f6938556
Fix: Precision in Appraisals ( #17673 )
...
* Update appraisal.js
This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.
* fix: score based on field's precisin
2019-05-27 13:57:56 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50
fix: GSTR-1 Report B2B fixes ( #17751 )
...
* fix: GSTR-1 Report fixes
* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c
fix: holidays was showing on same date in calendar view ( #17754 )
2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
