Deepesh Garg
0d28802485
Merge pull request #17815 from deepeshgarg007/ar_translation
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:18 +05:30
Saurabh
254774f7a3
Merge pull request #17817 from rohitwaghchaure/fixed_pos_cash_payment_modal
...
fix: POS cash mode of payment css
2019-05-31 12:28:53 +05:30
Rohit Waghchaure
6f1e624465
fix: POS cash mode of payment css
2019-05-30 23:19:55 +05:30
deepeshgarg007
2dcd03d17d
fix: Label translations
2019-05-30 22:33:02 +05:30
deepeshgarg007
ffcb7aa6ed
fix: Add translations for missing labels in AR report
2019-05-30 22:26:52 +05:30
Suraj Shetty
fc092d0df4
Merge pull request #17807 from deepeshgarg007/gstr-1-condition-fix
...
fix: GSTR-1 report B2B condition fix
2019-05-30 17:24:04 +05:30
Rushabh Mehta
51bb2909c3
Merge pull request #17790 from deepeshgarg007/customer_lead_dashboard
...
fix: Customer and Lead dashboard fixes for opportunity and quotation
2019-05-30 17:21:25 +05:30
Suraj Shetty
cab0cd55b3
Merge branch 'hotfix' into gstr-1-condition-fix
2019-05-30 16:38:45 +05:30
deepeshgarg007
4f579639c6
fix: Use AND instead of OR
2019-05-30 16:26:38 +05:30
deepeshgarg007
95dc4e4dc5
fix: Use make methods to override
2019-05-30 15:28:15 +05:30
Sahil Khan
dc35138356
Merge branch 'hotfix'
2019-05-30 12:09:35 +05:30
Sahil Khan
08617f7700
bumped to version 11.1.35
2019-05-30 12:29:35 +05:50
Anurag Mishra
cfecf3c5b1
fix: Added description if item variants does not have description in map ( #17795 )
...
* fix: variant item description based on attribute
* fix: requested changes
* fix: refactor
2019-05-29 17:16:48 +05:30
Shivam Mishra
831100b657
Merge pull request #17792 from adityahase/remove-manifest-hotfix
...
perf: Remove MANIFEST.in
2019-05-29 15:31:26 +05:30
Aditya Hase
f296a2f58a
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:15:05 +05:30
deepeshgarg007
18a0120fc1
fix: Customer and Lead dashboard fixes for opportunity and quotation
2019-05-29 14:20:24 +05:30
Nabin Hait
aae557e8a1
Merge pull request #17779 from sunnyakaxd/patch-1
...
fix (performance): Dont fetch all orders to update a few
2019-05-29 10:04:37 +05:30
Nabin Hait
0f92c4b85b
Merge pull request #17778 from deepeshgarg007/lead_owner
...
fix: Lead owner efficiency report query and column fixes
2019-05-29 09:57:08 +05:30
deepeshgarg007
217df1761d
fix: Styling fixes
2019-05-29 08:10:07 +05:30
Himanshu Mishra
d355741462
Python 2 compatibility -_-
2019-05-28 23:54:03 +05:30
Himanshu Mishra
7b6ed4f16e
Update status_updater.py
2019-05-28 23:51:22 +05:30
deepeshgarg007
c5a682e9d9
fix: Lead owner efficiency report query and column fixes
2019-05-28 23:40:05 +05:30
Sahil Khan
b4fa105555
Merge branch 'hotfix'
2019-05-28 14:50:05 +05:30
Sahil Khan
e1aef6f0db
bumped to version 11.1.34
2019-05-28 15:10:05 +05:50
Nabin Hait
6f35d2b52d
Merge pull request #17764 from nabinhait/salary-slip-tax-calc
...
fix: Tax calculation on salary slip
2019-05-28 11:16:40 +05:30
rohitwaghchaure
197f57c050
Merge pull request #17766 from rohitwaghchaure/renamed_delayed_item_report
...
fix: rename delayed order item report
2019-05-27 19:33:41 +05:30
Rohit Waghchaure
c74fa7546b
fix: rename delayed order item report
2019-05-27 19:32:43 +05:30
Nabin Hait
233ef8752d
Merge pull request #17550 from dimanex/bugfix/17547-Pricing-Rules-are-broken
...
Pricing Rules are not queried correctly after removing 'customer' and adding 'party_name' in Quotation #17547
2019-05-27 19:24:24 +05:30
Nabin Hait
afd9e7546f
Merge branch 'hotfix' into bugfix/17547-Pricing-Rules-are-broken
2019-05-27 19:22:34 +05:30
Nabin Hait
8b1532d691
Merge pull request #17758 from saurabh6790/custom_field_fix_hotfix
...
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:16 +05:30
Nabin Hait
a887c29e06
Merge pull request #17760 from nabinhait/multi-fixes99
...
fix: Error due to merging of lead/customer to party_name
2019-05-27 19:11:01 +05:30
Nabin Hait
7114b72be8
fix: Tax calculation on salary slip
2019-05-27 18:42:20 +05:30
Nabin Hait
92ab345daf
Merge pull request #17018 from chdecultot/fec_improvement
...
fix: Addition of third party types in FEC
2019-05-27 17:18:42 +05:30
Nabin Hait
79dd4d707b
fix: Error fixed due to merging of lead/customer to party_name
2019-05-27 15:44:12 +05:30
Nabin Hait
a3a733fa91
fix: error because of non-mandatory fields
2019-05-27 15:43:26 +05:30
Nabin Hait
7a9b014f72
fix: Made item code non-mandatory in item
2019-05-27 15:41:06 +05:30
Saurabh
61b4a98356
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:25:47 +05:30
Don-Leopardo
46db69b304
fix: Make from Lead to Opportunity ( #17727 )
...
* fix: lead to oportunity error
* fix: one more missmatched field
2019-05-27 14:22:52 +05:30
Joe Paul
a0be41322d
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:11:52 +05:30
Saif
05f29988f4
fix: Status updater for Credit/Debit Note Issued ( #16998 )
...
* fix: Status updater for Credit/Debit Note Issued higher precendence than Return
* style: linting
2019-05-27 14:05:14 +05:30
Deepesh Garg
d7903de51c
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17726 )
2019-05-27 13:41:58 +05:30
Kenneth Sequeira
0e31cc9ff8
improve error message ( #17745 )
...
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 13:40:40 +05:30
rohitwaghchaure
32280a11aa
fix: customer item code not fetched on selection of the item in the sales order ( #17755 )
2019-05-27 13:32:44 +05:30
Anurag Mishra
a2f9d2f89c
fix: holidays was showing on same date in calendar view ( #17753 )
2019-05-27 13:20:06 +05:30
Nabin Hait
5fc5355b96
fix: Opening accounting entry for stock entry ( #17710 )
...
* fix: Opening accounting entry for stock entry
* test: Add test case for opening stock entry gle
* fix: validate expense account for opening stock entry
* fix: validate expense account for opening stock reco
2019-05-27 11:50:08 +05:30
Deepesh Garg
30c73e6b35
fix: Only show registered customers for GSTR-1 B2B Report ( #17719 )
2019-05-27 11:48:40 +05:30
Nabin Hait
7a6b88c791
fix: payment reconciliation against expense claim ( #17728 )
...
* feat: Added dashboard in expense claim
* fix: payment reconciliation against expense claim
2019-05-27 11:41:05 +05:30
rohitwaghchaure
9c42124fbc
Merge pull request #17720 from rohitwaghchaure/reverting_method_to_show_stock_value
...
fix: warehouse tree view taking lot of time to load
2019-05-23 16:36:34 +05:30
Rohit Waghchaure
0378b15412
fix: warehouse tree view taking lot of time to load
2019-05-23 16:34:32 +05:30
rohitwaghchaure
3f86369604
fix: range 4 for ageing filter added in the AP/AR report ( #17714 )
2019-05-23 15:27:17 +05:30
