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
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
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
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
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
prssanna
2aebf99968
fix: add removed get_employee_emails function
2021-01-29 15:55:21 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total ( #24497 )
2021-01-29 14:24:08 +05:30
rohitwaghchaure
cf3e0cf271
Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop
...
fix: extra transferred qty has not consumed against work order
2021-01-29 12:28:28 +05:30
Suraj Shetty
ba599f7676
chore: Update eslintrc - add cur_pos as global
2021-01-29 09:05:32 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Deepesh Garg
989c853e3b
Merge pull request #24490 from deepeshgarg007/report_ltv_ratio_fix
...
fix: LTV ratio in interest report
2021-01-28 23:28:40 +05:30
Deepesh Garg
7e3f5e04ab
fix: LTV ration in interest report
2021-01-28 23:25:23 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
leela
3234df5581
feat: improved call log doctype
...
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
2021-01-28 18:34:58 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes ( #24445 )
...
* feat: shopping portal changes
* fix: review changes
* review changes
2021-01-28 17:32:57 +05:30
Marica
56c6805d79
Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop
2021-01-28 15:03:15 +05:30
Marica
26f6fa326c
Merge pull request #24451 from marination/project-naming-series-patch
...
fix: Patch to Add Naming Series to old projects
2021-01-28 14:50:25 +05:30
Marica
9580adad0c
Merge branch 'develop' into project-naming-series-patch
2021-01-28 14:32:11 +05:30
Marica
a16ad3063f
Merge pull request #24127 from deepeshgarg007/lcv_multicurrency
...
feat: Multi currency in landed cost voucher
2021-01-28 13:35:37 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency
2021-01-28 13:29:36 +05:30
