Aditya Hase
|
0b1dc32fcb
|
Merge pull request #16597 from adityahase/python3-fix
fix(py3): Use range instead of xrange
|
2019-02-07 18:17:37 +05:30 |
|
Aditya Hase
|
b9dc031e86
|
fix(py3): Use range instead of xrange
|
2019-02-07 18:10:30 +05:30 |
|
Rushabh Mehta
|
665ee4ac33
|
Merge pull request #16480 from pratu16x7/explore-2.0
feat(explore_page): rearrange links
|
2019-02-07 12:20:27 +05:30 |
|
Prateeksha Singh
|
3423407314
|
feat(module_links): rearrange links
|
2019-02-07 09:58:22 +05:30 |
|
Prateeksha Singh
|
9b14d46c1d
|
purge(modules): remove old desktop icon configs
|
2019-02-07 09:58:22 +05:30 |
|
Prateeksha Singh
|
063af4ed08
|
config(modules): Rearrange links
|
2019-02-07 09:58:22 +05:30 |
|
Prateeksha Singh
|
b5eb16faeb
|
feat(config): add some onboarding cues
|
2019-02-07 09:58:22 +05:30 |
|
Prateeksha Singh
|
ce27cffaad
|
refactor(desk_icon): Remove reference and patches to Desktop Icon
|
2019-02-07 09:58:21 +05:30 |
|
Prateeksha Singh
|
2c14704398
|
feat(modules): Add Retail module, update others
|
2019-02-07 09:57:10 +05:30 |
|
Prateeksha Singh
|
7cd6ebeb6d
|
feat(explore_page): rearrange links
|
2019-02-07 09:57:10 +05:30 |
|
Raffael Meyer
|
ff878c0c1d
|
fix formatting and names
|
2019-02-07 03:28:27 +01:00 |
|
Faris Ansari
|
504f317434
|
fix: BOM Stock Calculated Report (#16585)
- Cast null values to 0 to avoid mathematic errors
|
2019-02-07 07:15:38 +05:30 |
|
Faris Ansari
|
8ae5dbcac8
|
fix: Set barcode in Item row after scanning barcode (#16591)
|
2019-02-07 07:09:49 +05:30 |
|
Himanshu
|
088886e082
|
Remove illegal character after break (#16589)
|
2019-02-07 07:09:20 +05:30 |
|
Sagar Vora
|
da1dc7fa52
|
Merge branch 'master' into develop
|
2019-02-05 18:40:39 +05:30 |
|
Sagar Vora
|
76120309e3
|
Merge branch 'hotfix'
|
2019-02-05 18:40:38 +05:30 |
|
Sagar Vora
|
8aa34a0ce0
|
bumped to version 11.1.4
|
2019-02-05 19:00:38 +05:50 |
|
Prateeksha Singh
|
34df5d27a1
|
Merge pull request #16518 from karthikeyan5/staging-marketplace-features
fix(marketplace): bug in filtering menu_items
|
2019-02-05 18:09:57 +05:30 |
|
karthikeyan5
|
4cb0a250a0
|
fix(marketplace): bug in filtering menu_items
> UX improvment for incomplete feature
|
2019-02-05 18:07:48 +05:30 |
|
Nabin Hait
|
efff826e15
|
Merge pull request #16556 from nabinhait/payroll-cost-center
fix: Don't force fetch cost center from company in payroll entry
|
2019-02-05 13:32:16 +05:30 |
|
Nabin Hait
|
8a46df5c4b
|
Removed duplicate fields
|
2019-02-05 13:31:32 +05:30 |
|
Nabin Hait
|
38b05a1296
|
fix: Set default cost center in payroll entry
|
2019-02-05 10:46:41 +05:30 |
|
Nabin Hait
|
294319e71b
|
fix: Don't force fetch cost center from company in payroll entry
|
2019-02-05 10:37:41 +05:30 |
|
Nabin Hait
|
ad69e29334
|
Merge pull request #16548 from nabinhait/stock-balance-item
fix: Fetch data based on item group filter in item dashboard stock balance report
|
2019-02-05 10:36:47 +05:30 |
|
Nabin Hait
|
1c288ca4ab
|
Merge pull request #16558 from deepeshgarg007/production_plan
fix: Validation while getting raw materials for production in Production Plan
|
2019-02-05 10:35:16 +05:30 |
|
Nabin Hait
|
fe6f1ad244
|
Update production_plan.py
|
2019-02-05 10:34:58 +05:30 |
|
Nabin Hait
|
d4e029665c
|
Merge pull request #16569 from nabinhait/salary-allow-on-submit
fix: Allow-on-submit enabled for formula and condition in salary structure
|
2019-02-05 10:31:24 +05:30 |
|
Nabin Hait
|
b6d2c7eb80
|
Merge pull request #16570 from saurabh6790/jinja_injection_fix
fix: access request parameter directly
|
2019-02-05 10:31:08 +05:30 |
|
Nabin Hait
|
7b93e738ad
|
Merge pull request #16576 from nabinhait/pay_reco_fix
fix: Optimising payment reconciliation queries
|
2019-02-05 10:28:03 +05:30 |
|
Nabin Hait
|
025e780f31
|
Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working
fix: job card not working if transfer against work order
|
2019-02-05 10:27:12 +05:30 |
|
Nabin Hait
|
56bff95e15
|
Merge pull request #16571 from Thunderbottom/purchase-invoice-fix
fix(purchase_invoice): fix undefined variable
|
2019-02-05 10:26:41 +05:30 |
|
Nabin Hait
|
ac18498ca5
|
fix: Optimising payment reconciliation queries
|
2019-02-04 21:13:43 +05:30 |
|
Rohit Waghchaure
|
780c6b0d77
|
fix: job card not working if transfer against work order
|
2019-02-04 21:04:48 +05:30 |
|
Chinmay Pai
|
125505f2aa
|
fix(purchase_invoice): fix undefined variable
fixes issue while creating purchase invoice
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
|
2019-02-04 16:30:20 +05:30 |
|
Saurabh
|
bbebceb31a
|
fix: access request parameter directly
|
2019-02-04 15:56:23 +05:30 |
|
Nabin Hait
|
ff05ee50e0
|
fix: Allow-on-submit enabled for formula and condition in salary structure
|
2019-02-04 14:42:57 +05:30 |
|
Deepesh Garg
|
d442d06947
|
Update production_plan.py
|
2019-02-03 12:45:20 +05:30 |
|
dgarg007
|
f667cff5a6
|
fix: Validation while getting raw materils for production in Production Plan
|
2019-02-02 21:57:00 +05:30 |
|
Nabin Hait
|
690b83076d
|
Merge pull request #16377 from SaiFi0102/Item-Tax-Template-V12
feat: Tax Category and Item Tax Template (v12)
|
2019-02-02 13:51:55 +05:30 |
|
rohitwaghchaure
|
752f2f1805
|
Merge pull request #16547 from rohitwaghchaure/project_status_email_fix
fix: check open status projects for project status update
|
2019-02-02 13:06:29 +05:30 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
Saurabh
|
aba611e09f
|
Merge branch 'hotfix' into project_status_email_fix
|
2019-02-01 15:01:26 +05:30 |
|
Nabin Hait
|
e1c75a9d55
|
fix: fixed salary structure assignment patch (#16546)
* fix: fixed salary structure assignment patch
* fix: patch
|
2019-02-01 12:25:40 +05:30 |
|
Nabin Hait
|
f3f4ce9b87
|
fix: Fetch data based on item group filter in item dashboard stock balance report
|
2019-02-01 12:01:19 +05:30 |
|
Rohit Waghchaure
|
a4645b6d17
|
fix: check open status projects for project status update
|
2019-02-01 11:37:22 +05:30 |
|
Raffael Meyer
|
fef07eeae2
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-01-31 22:16:26 +01:00 |
|
Sagar Vora
|
ec5faaeae6
|
Merge branch 'hotfix' into stock-balance-fix
|
2019-01-31 18:46:06 +05:30 |
|
Nabin Hait
|
9ea19b8fe1
|
fix: Fixed error on stock balance report
|
2019-01-31 15:53:25 +05:30 |
|
Sagar Vora
|
56cbfe4bb0
|
Merge branch 'master' into develop
|
2019-01-31 13:34:32 +05:30 |
|
Sagar Vora
|
7a2163ca39
|
Merge branch 'hotfix'
|
2019-01-31 13:33:07 +05:30 |
|