Sagar Sharma
|
6e015fd6be
|
Merge branch 'develop' into fix-mr-rate-and-amount
|
2023-01-31 12:39:38 +05:30 |
|
Deepesh Garg
|
b3dc22de29
|
fix: Fetch commission rate from sales partner (#33851)
|
2023-01-31 09:33:33 +05:30 |
|
Anand Baburajan
|
e007776ada
|
Merge pull request #33888 from barredterra/get-asset-value
fix(Fixed Asset Register): error when selecting more than one fiscal …
|
2023-01-31 01:59:53 +05:30 |
|
barredterra
|
11d165c274
|
fix(Fixed Asset Register): error when selecting more than one fiscal year
|
2023-01-30 19:33:58 +01:00 |
|
Anand Baburajan
|
3e5f8323b0
|
Merge pull request #33883 from AnandBaburajan/fix_disposal_was_made_on_original_schedule_date_develop
fix: disposal_was_made_on_original_schedule_date [develop]
|
2023-01-30 22:02:34 +05:30 |
|
Anand Baburajan
|
5d8a2d3d3b
|
Merge branch 'develop' into fix_disposal_was_made_on_original_schedule_date_develop
|
2023-01-30 21:36:51 +05:30 |
|
anandbaburajan
|
f487660a7c
|
fix: disposal_was_made_on_original_schedule_date
|
2023-01-30 21:33:43 +05:30 |
|
Deepesh Garg
|
2bad86d8d8
|
ci: bump isort to 5.12.0 (#33875)
[skip ci]
|
2023-01-30 19:58:23 +05:30 |
|
ruthra kumar
|
5f38859a04
|
Merge pull request #33736 from rtdany10/gp-report-fix
fix(gp): fetch buying amount from dn related to so
|
2023-01-30 19:04:36 +05:30 |
|
Dany Robert
|
d69c839369
|
chore: linting issues
|
2023-01-30 10:45:08 +00:00 |
|
Dany Robert
|
1f6ab86a65
|
feat(gp): test for inv and dn related via so
|
2023-01-30 10:35:43 +00:00 |
|
s-aga-r
|
6b781d78e0
|
fix: amount in Material Request
|
2023-01-30 12:51:59 +05:30 |
|
Deepesh Garg
|
a34a1f8fd2
|
fix: Amount validation in Payment Request against Purchase Order (#33855)
fix: Amount validation in Payment Request againt Purchase Order
|
2023-01-29 21:34:28 +05:30 |
|
Deepesh Garg
|
faecf3ee40
|
fix: Lead to customer creation (#33859)
|
2023-01-29 21:25:49 +05:30 |
|
Deepesh Garg
|
6674edface
|
chore: Resize numeric and date columns (#33858)
|
2023-01-29 21:25:26 +05:30 |
|
Deepesh Garg
|
428b099f63
|
fix: Ignore linked JE on JE cancellation (#33852)
|
2023-01-29 17:27:17 +05:30 |
|
Deepesh Garg
|
8abe0ce0ec
|
fix: Currency symbol for tax withholding net total field (#33850)
* fix: Currency symbol for tax withholding net total field
* chore: Update display depends on property
|
2023-01-29 17:08:11 +05:30 |
|
ruthra kumar
|
f270880735
|
fix: double salutation on quotation print (#33834)
'lead_name' always has salutation.
|
2023-01-28 18:17:25 +05:30 |
|
rohitwaghchaure
|
1b967f37af
|
Merge pull request #33845 from rohitwaghchaure/fixed-item-not-fetching-issue
fix: item rate not fetching
|
2023-01-28 15:10:02 +05:30 |
|
Rohit Waghchaure
|
0d7f98b496
|
fix: item rate not fetching
|
2023-01-28 13:51:33 +05:30 |
|
Sabu Siyad
|
9e50aa4833
|
feat(pos): multiple item prices (#33005)
* fix(pos): multiple item prices
feat: show uom with product price
feat: multiple item (variant) depending on uom
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): consider uom for new item
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): uom based stock display
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* use `//` instead of `math.floor()`
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): uom by barcode
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* fix: replace `is not` with `!=`
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* fix(pos): barcode_info `next()`: fallback
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* chore: format
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* Update erpnext/selling/page/point_of_sale/point_of_sale.py
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* chore: un-ignore unused local variable
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
---------
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
|
2023-01-28 10:28:31 +05:30 |
|
Deepesh Garg
|
3598bcc9a8
|
chore: ERPNext setup wizard cleanup (#33675)
* chore: ERPNext setup wizard cleanup
* chore: Remove default website
* chore: Remove flaky tests
* chore: remove unwanted tests
|
2023-01-27 14:40:39 +05:30 |
|
ruthra kumar
|
9dd6b3c950
|
Merge pull request #33835 from ruthra-kumar/skip_validation_on_migration
fix(patch): validation error on cost center allocation migration
|
2023-01-27 13:40:57 +05:30 |
|
ruthra kumar
|
de10f2dc00
|
fix(patch): validation error on cost center allocation migration
If Distributed cost centers have GL postings on patch run date,
patch failes with valiation error.
|
2023-01-27 12:08:18 +05:30 |
|
Sagar Vora
|
7e592fdf91
|
Merge pull request #33831 from dj12djdjs/perf-update-items
perf: show update items dialog
|
2023-01-27 04:17:39 +00:00 |
|
Devin Slauenwhite
|
a835c1a418
|
perf: show update items dialog
|
2023-01-26 16:53:05 -05:00 |
|
ruthra kumar
|
b31b850db8
|
fix: disfuctional cost center filter on Journal Entries (#33815)
* fix: missing cost_center filter for journal entries
* test: cost center filter on invoices, journals and payments
|
2023-01-26 20:26:21 +05:30 |
|
Vishal Dhayagude
|
c5ca8d74c4
|
fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800)
* fix: GST Category validation is given for pos customer
|
2023-01-26 15:45:51 +05:30 |
|
Anand Baburajan
|
e3d7426b47
|
Merge pull request #33823 from AnandBaburajan/fix_translations
chore: remove broken translation
|
2023-01-26 13:46:16 +05:30 |
|
anandbaburajan
|
21f425660d
|
chore: remove broken translation
|
2023-01-26 13:15:01 +05:30 |
|
Ankush Menat
|
33b68552f1
|
chore: remove broken translation
[skip ci]
|
2023-01-25 17:35:23 +05:30 |
|
Daizy Modi
|
da323cbb40
|
fix: use correct filter name in item_query (#33814)
|
2023-01-25 17:32:21 +05:30 |
|
Sagar Vora
|
41222659a6
|
Merge pull request #33813 from frappe/revert-33810-fix-quality-inspection-item-query
Revert "fix: use correct filter name in reports"
|
2023-01-25 10:50:03 +00:00 |
|
Sagar Vora
|
1f4fa90072
|
Revert "fix: use correct filter name in reports"
|
2023-01-25 16:19:44 +05:30 |
|
Sagar Sharma
|
58dab9ca8b
|
Merge pull request #33810 from resilient-tech/fix-quality-inspection-item-query
fix: use correct filter name in reports
|
2023-01-25 16:15:04 +05:30 |
|
Daizy Modi
|
def759d2e8
|
fix: use correct filter name in reports
|
2023-01-25 15:57:39 +05:30 |
|
Sagar Sharma
|
a067a904a1
|
Merge pull request #33797 from s-aga-r/fix-sco-status
chore: add `Cancelled` status in SCO `get_indicator`
|
2023-01-24 17:33:57 +05:30 |
|
Sagar Sharma
|
302f5e27be
|
Merge branch 'develop' into fix-sco-status
|
2023-01-24 17:33:29 +05:30 |
|
s-aga-r
|
840f9d8987
|
chore: add Cancelled status in SCO get_indicator
|
2023-01-24 17:30:37 +05:30 |
|
rohitwaghchaure
|
a5478c61af
|
Merge pull request #33790 from rohitwaghchaure/fix-web-supplier-quotation-from-rfq
fix: web supplier quotation
|
2023-01-24 15:59:04 +05:30 |
|
Raffael Meyer
|
d155042edd
|
ci: documentation helper (#33757)
refactor: documentation helper
|
2023-01-24 11:42:44 +05:30 |
|
Anand Baburajan
|
84383087a6
|
Merge pull request #33789 from AnandBaburajan/update_translations_for_naming_series_error
chore: update translations for naming series error
|
2023-01-23 18:48:10 +05:30 |
|
anandbaburajan
|
4e6066f929
|
chore: fix translations
|
2023-01-23 18:07:32 +05:30 |
|
Rohit Waghchaure
|
7800db7c0d
|
fix: web supplier quotation
|
2023-01-23 14:21:10 +05:30 |
|
Anand Baburajan
|
7d5df407c4
|
Merge branch 'develop' into update_translations_for_naming_series_error
|
2023-01-23 14:19:39 +05:30 |
|
anandbaburajan
|
bbde1f611f
|
chore: update translations for naming series error
|
2023-01-23 14:16:31 +05:30 |
|
rohitwaghchaure
|
b3a216c8f8
|
Merge pull request #33785 from rohitwaghchaure/get-items-from-transit-entry
feat: get items from Transit Stock Entry
|
2023-01-23 13:03:53 +05:30 |
|
Rohit Waghchaure
|
62141b0b63
|
feat: get items from Transit Stock Entry
|
2023-01-23 12:01:57 +05:30 |
|
Deepesh Garg
|
a3c89dbc10
|
fix: TDS deduction in payment entry (#33747)
* fix: TDS deduction in payment entry
|
2023-01-22 23:31:19 +05:30 |
|
Xeanth
|
ad437fd5ba
|
fix: use stock qty to calculate POS reserved stock (#33735)
|
2023-01-22 18:06:01 +05:30 |
|