Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,482 Commits 3 Branches 0 Tags 1 GiB
6a89cb98ce
Commit Graph

44482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin D'souza
940ad6e3f2 fix: Fetch all fields via get_returned_qty_map_for_row 2023-02-01 13:53:37 +05:30
Gavin D'souza
3518d4be1d fix(update_billing_percentage): Remove permlevel checks on aggregated 
value
 2023-02-01 12:58:08 +05:30
Raffael Meyer
3c7b460fd8
fix: german chart of accounts "SKR03" (#33909) 
* fix: german chart of accounts "SKR03"

- Added some missing account types and tax rates
- Added some missing accounts

* style: convert indentation to tabs

* fix: space before percentage sign

* feat: add some expense accounts

* refactor: replace unicode characters with utf-8

for better readability

* revert: add back groups for Bank and Cash accounts

Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100
 2023-02-01 12:16:58 +05:30
Deepesh Garg
103a91ed40
Merge pull request #33808 from dj12djdjs/fix-lead-rename 
fix: make title field readonly
 2023-02-01 12:02:33 +05:30
ruthra kumar
9bb64107c5 perf: reduce memory usage while migrating remarks 
Page through records using primary key
 2023-02-01 10:44:44 +05:30
Sagar Sharma
4ac983cf09
Merge pull request #33910 from barredterra/named-place-rfq 
feat: add incoterm named place to RFQ
 2023-02-01 10:40:09 +05:30
barredterra
7156184933 feat: add incoterm named place to RFQ 2023-01-31 23:23:54 +01:00
marination
ece6358e60 fix: Iterate over list instead of map's output and formatting 2023-01-31 17:13:05 +05:30
rohitwaghchaure
c5834c1db4
Merge pull request #33896 from rohitwaghchaure/inventory-dimension-mandatory 
feat: mandatory and mandatory depends on in inventory dimension
 2023-01-31 15:18:14 +05:30
rohitwaghchaure
ddb4396117
Merge pull request #33715 from s-aga-r/fix-pick-list 
fix: consider existing pick-list
 2023-01-31 15:10:19 +05:30
Sagar Sharma
510b265830
Merge pull request #33869 from s-aga-r/fix-mr-rate-and-amount 
fix: `amount` in `Material Request`
 2023-01-31 14:44:11 +05:30
s-aga-r
6ffdeb1af8 fix: consider stock_qty if picked_qty is zero 2023-01-31 14:39:57 +05:30
Rohit Waghchaure
22d0e1373b test: added test case 2023-01-31 14:36:26 +05:30
Rohit Waghchaure
423f2b5627 feat: mandatory and mandatory depends on in inventory dimension 2023-01-31 14:19:14 +05:30
Sagar Sharma
6e015fd6be
Merge branch 'develop' into fix-mr-rate-and-amount 2023-01-31 12:39:38 +05:30
Sagar Sharma
57c8871de0
Merge branch 'develop' into fix-pick-list 2023-01-31 12:38:58 +05:30
s-aga-r
0b76a26c8a refactor: test_consider_existing_pick_list() 2023-01-31 12:38:30 +05:30
s-aga-r
bb7fe795fe test: add test cases 2023-01-31 12:38:30 +05:30
s-aga-r
207eeefc85 fix(test): test_pick_list_for_items_with_multiple_UOM() 2023-01-31 12:38:30 +05:30
s-aga-r
5138ef0160 fix: pymysql.err.ProgrammingError 2023-01-31 12:38:30 +05:30
s-aga-r
7b3d496ce0 fix: get_picked_items_details 2023-01-31 12:38:30 +05:30
s-aga-r
be41052dc8 chore: add status field in Pick List 2023-01-31 12:38:30 +05:30
s-aga-r
b642718f08 fix: consider existing pick list 2023-01-31 12:38:27 +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
marination
fa9b327501 chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table 2023-01-30 16:27:01 +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
marination
94cacb60de feat: Filter rows to be mapped on server side mapping function 
- Pass dialog selections to `make_sales_order`
- Map either original item or its alternative depending on mapping
- Only qty check for simple rows (without alternatives and not an alternative itself)
 2023-01-30 13:54:30 +05:30
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
fee0ca8cd9 perf: reduce memory usage by paging through records 
While migrating GL entries to Payment Ledger, page through records using
primary key to reduce memory usage.
 2023-01-29 15:27:01 +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