Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report ( #24483 )
2021-02-05 23:35:47 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes ( #24554 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-05 23:34:18 +05:30
prssanna
4742a25942
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-05 17:35:29 +05:30
prssanna
91b41db9e3
fix: check if product_info exists before setting price
2021-02-05 17:34:56 +05:30
Prssanna Desai
ec337f64d9
Merge pull request #24556 from anupamvs/s-c-changes
2021-02-05 17:26:55 +05:30
Anupam
d7f4aefd00
feat: added continue-shopping button on cart
2021-02-05 16:17:20 +05:30
Prssanna Desai
b8f4cdfbce
Merge pull request #24555 from prssanna/product-query-fix
...
fix: check if product_info exists
2021-02-05 14:54:23 +05:30
prssanna
a7820f310c
fix: check if product_info exists
2021-02-05 14:52:31 +05:30
Afshan
b814b002ce
fix: creating salary slip from timesheet ( #24541 )
2021-02-05 11:34:55 +05:30
Saqib Ansari
8c3da162ba
feat: introduce parameter group in quality inspection
2021-02-04 19:39:41 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation
2021-02-04 18:38:26 +05:30
Deepesh Garg
eff675f45b
Merge pull request #24536 from deepeshgarg007/accounts_user_perm
...
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:10:12 +05:30
Deepesh Garg
dce73d1881
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:06:36 +05:30
pateljannat
0701f08ab6
fix: item_group on update items
2021-02-03 11:53:14 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes ( #24489 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
2021-02-02 22:03:07 +05:30
Saurabh
df589594cd
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-02-02 20:58:26 +05:30
Saurabh
7645e5319d
bumped to version 13.0.0-beta.11
2021-02-02 21:15:21 +05:50
Afshan
c0f8f32801
fix: fetch query for employee ( #24529 )
2021-02-02 20:27:23 +05:30
Saurabh
17433d2c90
fix: version number
2021-02-02 17:40:11 +05:30
Nabin Hait
243d59b0c3
Reposting logic fixes ( #24520 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
* fix: test fix
2021-02-02 16:55:13 +05:30
Afshan
10b00f9d0d
fix: separation of salary creation from payroll ( #24528 )
...
* fix: separation of salary creation from payroll
* fix: removed unnecessary veriable
* fix: check existing sal slips
* fix: existing checks
* style: refactoring query
2021-02-02 16:24:01 +05:30
Saqib Ansari
ef65d6463e
Merge branch 'develop' into tcs_calculation
2021-02-02 13:53:20 +05:30
Anupam Kumar
7d64a291b8
fix: contact permmission issue ( #24503 )
2021-02-02 12:43:13 +05:30
Afshan
91a02868cb
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:04:25 +05:30
Afshan
8676089794
fix: emp disappear ( #24524 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:02:22 +05:30
Nabin Hait
bf97eb2d3b
core: Added change log ( #24526 )
2021-02-02 10:57:55 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
rohitwaghchaure
f9642eb333
Merge pull request #24522 from rohitwaghchaure/fixed-pricing-rule-travis-issues-develop
...
fix: test cases for pricing rule
2021-02-01 23:07:37 +05:30
Rohit Waghchaure
d4d639c7ed
fix: test cases for pricing rule
2021-02-01 23:01:18 +05:30
rohitwaghchaure
6d462e058b
Merge pull request #24521 from rohitwaghchaure/fixed-pricing-rule-travis-issues
...
fix: test cases for pricing rule
2021-02-01 23:00:24 +05:30
Rohit Waghchaure
5c28416daa
fix: test cases for pricing rule
2021-02-01 22:58:22 +05:30
Suraj Shetty
d809de6579
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 22:40:46 +05:30
Suraj Shetty
852e67c5ee
fix(patch): Use db_set to ignore validation
2021-02-01 22:40:40 +05:30
prssanna
6f1664223d
style: missing semicolon
2021-02-01 20:43:30 +05:30
prssanna
44a055b52f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:39:20 +05:30
Marica
0ea2587679
fix: Numeric/Non-numeric QI UX ( #24516 )
...
* chore: Show 1 field each of both types of Insoections in grid view
* fix: Make QI check Numeric by default and make checkbox "Numeric"
- Reducing cognitive load
2021-02-01 20:38:53 +05:30
Marica
003ae90e12
fix: Numeric/Non-numeric QI UX ( #24517 )
...
* chore: Show 1 field each of both types of Insoections in grid view
* fix: Make QI check Numeric by default and make checkbox "Numeric"
- Reducing cognitive load
2021-02-01 20:38:32 +05:30
prssanna
73d60aa498
style: fix formatting
2021-02-01 20:38:17 +05:30
Suraj Shetty
cfb5f58141
style: Fix formatting issues
2021-02-01 20:37:18 +05:30
Saurabh
9dcb286c31
fix: consider select perm while setting party details ( #24518 )
2021-02-01 20:36:15 +05:30
Suraj Shetty
723bd9676d
style: Fix formatting issues
2021-02-01 20:34:21 +05:30
prssanna
62442d1c52
style: fix formatting
2021-02-01 20:26:09 +05:30
rohitwaghchaure
bf7317d4e2
fix: multiple pricing rule issue ( #24509 )
2021-02-01 20:22:14 +05:30
rohitwaghchaure
68edf749ec
fix: multiple pricing rule issue ( #24515 )
2021-02-01 20:22:02 +05:30
Saurabh
081f506992
fix: consider select perm while setting party details ( #24514 )
2021-02-01 20:18:44 +05:30
prssanna
9a69c0e21e
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:13:01 +05:30
prssanna
526ea46ae2
fix: formatting issues
2021-02-01 20:12:47 +05:30
Suraj Shetty
159063db29
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:09:58 +05:30
Suraj Shetty
8586c08639
chore: Update translation syntax checker
2021-02-01 20:09:42 +05:30
Suraj Shetty
f57efd1150
style: Fix invalid translation syntax usages
2021-02-01 20:09:20 +05:30
