Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,084 Commits 3 Branches 0 Tags 1 GiB
c1ba35b25b
Commit Graph

36084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marica
2fa840e5d4
chore: Use sql to set naming series in older projects (#24513) 
* chore: Use sql to set naming series in older projects

* fix: Remove unncessary db.commit()
 2021-02-01 20:07:00 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects (#24512) 
* chore: Use sql to set naming series in older projects

* fix: Remove unncessary db.commit()
 2021-02-01 20:05:29 +05:30
prssanna
53225f5cbb Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 20:01:54 +05:30
prssanna
11eae6d51a fix: add default product-image css class 2021-02-01 20:01:37 +05:30
Suraj Shetty
8fef3a3814 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 19:52:12 +05:30
Suraj Shetty
1ab79da7d1 style: Fix formatting issues 2021-02-01 19:51:25 +05:30
prssanna
ba54c4f1b3 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 19:50:46 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
Suraj Shetty
8030abe1bd Merge branches 'rebrand-ui' and 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 19:41:03 +05:30
Suraj Shetty
f67bf7ae98 chore: Fix formatting issues 2021-02-01 19:40:44 +05:30
prssanna
1d346702ed chore: add .stylelintrc file 2021-02-01 19:07:32 +05:30
prssanna
7863118994 fix: docs link for store page in shopping cart settings 2021-02-01 18:57:30 +05:30
Saqib Ansari
cee3670167 chore: clean up sales invoice form 2021-02-01 15:45:26 +05:30
Suraj Shetty
13d48a0c20 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:11:07 +05:30
Suraj Shetty
055b81da7b Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:10:52 +05:30
Saqib
beebaf6e1e
refactor: assets form cleanup with rebrand ui (#24494) 2021-02-01 11:22:57 +05:30
Deepesh Garg
ab88ec208e fix: Error handling in loan reports 2021-01-31 12:31:46 +05:30
Deepesh Garg
a67daefb41
Merge pull request #24496 from frappe/template-task-parent-child-deadlock 
fix: Template task parent child deadlock
 2021-01-30 18:50:24 +05:30
prssanna
2aebf99968 fix: add removed get_employee_emails function 2021-01-29 15:55:21 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation 2021-01-29 14:26:48 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total (#24497) 2021-01-29 14:24:08 +05:30