deepeshgarg007
|
da64113b9a
|
feat: Logic for query and report creation for inactive items
|
2019-04-24 15:13:28 +05:30 |
|
deepeshgarg007
|
1bd69b4490
|
fix: Reordered and deleted unnecessary filters
|
2019-04-24 15:06:48 +05:30 |
|
deepeshgarg007
|
62d51d82ea
|
feat: Added filters and columns for inactive items report
|
2019-04-24 15:06:23 +05:30 |
|
Nabin Hait
|
6643156df6
|
Merge pull request #17347 from nabinhait/invoice-advances
fix: don't allocate advances if POS
|
2019-04-23 21:36:29 +05:30 |
|
Nabin Hait
|
6022f2bcf8
|
Merge pull request #17349 from rohitwaghchaure/invoiced_items_gross_margin_api
feat: Get invoiced item's gross margin using API
|
2019-04-23 21:36:02 +05:30 |
|
Nabin Hait
|
b890492dc0
|
Merge pull request #17348 from nabinhait/salary-slip-rounded
fix: Rounded tax amount in salary slip
|
2019-04-23 21:35:34 +05:30 |
|
Rohit Waghchaure
|
6ea108f01d
|
feat: Get invoiced item's gross margin using API
|
2019-04-23 18:56:26 +05:30 |
|
Nabin Hait
|
4c0e3aa097
|
Merge pull request #17341 from Alchez/hotfix-return-deliveries
fix(selling): Fix method to also consider return documents
|
2019-04-23 18:41:11 +05:30 |
|
Nabin Hait
|
631e334a3f
|
Merge pull request #17338 from chdecultot/bank_reco_corrections
fix: Bank reconciliation corrections
|
2019-04-23 18:40:03 +05:30 |
|
Deepesh Garg
|
2f4193757e
|
fix: Stock Ledger report fix (#17342)
|
2019-04-23 17:30:11 +05:30 |
|
Rohan Bansal
|
cba64988df
|
fix(selling): Fix method to also consider return documents
|
2019-04-23 16:39:09 +05:30 |
|
Nabin Hait
|
17e6fce486
|
fix: Rounded tax amount in salary slip
|
2019-04-23 15:51:28 +05:30 |
|
Nabin Hait
|
05fb3f2d75
|
fix: don't allocate advances if POS
|
2019-04-23 15:49:38 +05:30 |
|
Charles-Henri Decultot
|
af6360b273
|
Bank reconciliation corrections
|
2019-04-23 10:44:32 +02:00 |
|
Nabin Hait
|
043a47a9c0
|
Merge pull request #17329 from nabinhait/income-tax-period-factor
fix: Income tax period factor considering joining and relieving date
|
2019-04-22 21:07:35 +05:30 |
|
Nabin Hait
|
23e424911c
|
Merge branch 'hotfix' into income-tax-period-factor
|
2019-04-22 19:28:13 +05:30 |
|
Saif
|
a5fbeaa3d3
|
fix: Remove duplicate/incorrect patch
|
2019-04-22 17:29:36 +05:00 |
|
Nabin Hait
|
8aeb4b04bd
|
fix: Income tax period factor considering joining and relieving date
|
2019-04-22 17:39:02 +05:30 |
|
Nabin Hait
|
bbc7f474c3
|
Merge pull request #17327 from Anurag810/bom_prowser_patch
fix: (Patch) Removed page Bom-Browser
|
2019-04-22 15:54:35 +05:30 |
|
Anurag Mishra
|
26fe30685a
|
Merge branch 'hotfix' into bom_prowser_patch
|
2019-04-22 15:53:05 +05:30 |
|
Anurag Mishra
|
7bdd27f7e2
|
chore: used frappe.delete_doc_if_exists
|
2019-04-22 15:50:12 +05:30 |
|
Nabin Hait
|
96ec4aeda0
|
Merge pull request #17287 from alyf-de/skr
feat(accounts): add German CoA with numbers
|
2019-04-22 15:44:48 +05:30 |
|
Nabin Hait
|
cce65d41b8
|
Merge pull request #17325 from PawanMeh/fix_17324
fix: Attendance list not showing employee name
|
2019-04-22 14:58:07 +05:30 |
|
Nabin Hait
|
a44d46e535
|
Merge pull request #17320 from nabinhait/payroll-based-on-payment-days
fix: Renamed depends_on_lwp to depends_on_payment_days
|
2019-04-22 14:55:37 +05:30 |
|
Anurag Mishra
|
4f16d17d21
|
fix: resolve conflicts
|
2019-04-22 14:48:15 +05:30 |
|
Anurag Mishra
|
759bb0eb62
|
fix: (Patch) Removed page Bom-Browser
|
2019-04-22 14:46:00 +05:30 |
|
Sahil Khan
|
d7aa71aa70
|
Merge branch 'hotfix'
v11.1.22
|
2019-04-22 14:05:43 +05:30 |
|
Sahil Khan
|
32207ad722
|
bumped to version 11.1.22
|
2019-04-22 14:25:43 +05:50 |
|
hello@openetech.com
|
8a32ad206a
|
[fix] #17324
|
2019-04-22 13:58:30 +05:30 |
|
Nabin Hait
|
16bd2ed967
|
Merge pull request #17319 from SaiFi0102/Revert-Allocate-Advance-Automatically-V11
fix: Set Allocate Advance Automatically disabled by default (v11)
|
2019-04-22 13:32:30 +05:30 |
|
Nabin Hait
|
393b12a37f
|
fix: Renamed depends_on_lwp to depends_on_payment_days
|
2019-04-22 13:26:18 +05:30 |
|
Saif Ur Rehman
|
d1332f6c24
|
fix: Set Allocate Advance Automatically disabled by default
|
2019-04-22 12:17:25 +05:00 |
|
Saurabh
|
f36fa088f8
|
Merge pull request #17302 from sahil28297/new_site_sync
fix(site_sync): return more data in level
|
2019-04-22 12:46:20 +05:30 |
|
Saurabh
|
bb63103183
|
Merge branch 'hotfix' into new_site_sync
|
2019-04-22 12:46:13 +05:30 |
|
Anurag Mishra
|
7760db7563
|
fix: sales order status for order type 'Maintenance' (#17119)
* fix: Sales order Status for order type 'Maintenance'
* fix: test case for sales order
|
2019-04-22 12:15:11 +05:30 |
|
Saurabh
|
0ea1e67ce7
|
Merge branch 'hotfix' into new_site_sync
|
2019-04-22 11:59:52 +05:30 |
|
Nabin Hait
|
587b52dcd4
|
Merge pull request #17080 from auliabismar/patch-2
fix: Renumber Aktiva, remove excess 0
|
2019-04-22 11:21:15 +05:30 |
|
Nabin Hait
|
efcdf2fd42
|
Merge pull request #17255 from Anurag810/patch_for_salary_structure
fix: (Patch)make salary details submitable if salary structure is submitted
|
2019-04-22 11:17:28 +05:30 |
|
Nabin Hait
|
010a05df48
|
Update set_salary_details_submitable.py
|
2019-04-22 11:16:47 +05:30 |
|
Nabin Hait
|
58d565a882
|
Merge pull request #17292 from prasadarr/listing-fixes-hotfix
fix: Allow system manager to access share ledger
|
2019-04-22 11:13:17 +05:30 |
|
Nabin Hait
|
b655b07f20
|
Merge pull request #17309 from nabinhait/ar-fix
fix: Total row alignment in AR report
|
2019-04-22 11:11:45 +05:30 |
|
Sahil Khan
|
afb59fa5c0
|
fix: import iteritems
|
2019-04-22 10:47:37 +05:30 |
|
Sahil Khan
|
cb4b86512d
|
fix: syntax error
|
2019-04-22 10:10:50 +05:30 |
|
Kenneth Sequeira
|
c4a670c8c8
|
add salutation in contact display for lead (#17312)
|
2019-04-20 21:44:38 +05:30 |
|
Don-Leopardo
|
a26e2c064a
|
fix: Campaign Efficiency report only works in english (#17284)
* fix column translation and match
* fix float results
* fix import missing
|
2019-04-20 21:12:23 +05:30 |
|
Sahil Khan
|
3889d0f0a0
|
fix: refactor level
|
2019-04-20 14:26:49 +05:30 |
|
rohitwaghchaure
|
4e81fb20b9
|
fix: Move erpnext related methods from frappe to erpnext (#17293)
|
2019-04-20 11:50:45 +05:30 |
|
Nabin Hait
|
dfba52b834
|
fix: Total row alignment in AR report
|
2019-04-20 10:57:04 +05:30 |
|
Nabin Hait
|
f665e42e2a
|
Merge pull request #17307 from surajshetty3416/fix-employee-permission-hotfix
fix: Do not create employee user permission if already exists
|
2019-04-20 01:44:30 +05:30 |
|
Nabin Hait
|
560cc66a36
|
Merge pull request #17279 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered
|
2019-04-20 01:27:46 +05:30 |
|